Fix bugs

Signed-off-by: aliwoto <aminnimaj@gmail.com>
AnimeKaizoku · Feb 2, 2022 · b10cd97 · b10cd97
1 parent 24c9620
commit b10cd97
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@
 </p>
 
 > Name:		Rate Limiter			\
-> Version:	v1.0.6					\
+> Version:	v1.0.7					\
 > Edit:		2 Feb 2021				\
 > By:		ALiwoto and Contributors (C)	
 

diff --git a/ratelimiter/handlers.go b/ratelimiter/handlers.go
@@ -79,7 +79,7 @@ func (l *Limiter) limiterHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 		l.userMap[id] = status
 		l.mutex.Unlock()
 		if status.IsCustomLimited() {
-			if !status.custom.ignoreException && l.isException(ctx.Message) {
+			if !status.custom.ignoreException && l.isExceptionCtx(ctx) {
 				return ext.ContinueGroups
 			}
 			return ext.EndGroups
@@ -107,7 +107,7 @@ func (l *Limiter) limiterHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 		status.count = 0
 	}
 
-	if !l.isException(ctx.Message) {
+	if !l.isExceptionCtx(ctx) {
 		status.count++
 	}
 
@@ -128,7 +128,7 @@ func (l *Limiter) limiterHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 	status.Last = time.Now()
 
 	if status.IsCustomLimited() {
-		if !status.custom.ignoreException && l.isException(ctx.Message) {
+		if !status.custom.ignoreException && l.isExceptionCtx(ctx) {
 			return ext.ContinueGroups
 		}
 		return ext.EndGroups

diff --git a/ratelimiter/methods.go b/ratelimiter/methods.go
@@ -348,7 +348,7 @@ func (l *Limiter) runTriggers(b *gotgbot.Bot, ctx *ext.Context) {
 // it's id is in the exception list or not. This method's usage
 // is internal-only.
 func (l *Limiter) isException(msg *gotgbot.Message) bool {
-	if len(l.exceptionIDs) == 0 {
+	if len(l.exceptionIDs) == 0 || msg == nil {
 		return false
 	}
 
@@ -368,11 +368,18 @@ func (l *Limiter) isException(msg *gotgbot.Message) bool {
 	return false
 }
 
+func (l *Limiter) isExceptionCtx(ctx *ext.Context) bool {
+	if ctx.CallbackQuery != nil {
+		return l.isExceptionQuery(ctx.CallbackQuery)
+	}
+	return l.isException(ctx.Message)
+}
+
 // isException will check and see if msg can be ignored because
 // it's id is in the exception list or not. This method's usage
 // is internal-only.
 func (l *Limiter) isExceptionQuery(cq *gotgbot.CallbackQuery) bool {
-	if len(l.exceptionIDs) == 0 {
+	if len(l.exceptionIDs) == 0 || cq == nil {
 		return false
 	}