Allow notifications of selected window whenever the client is inactive

Author: Bionicgitman

src/event/server_events.c

@@ -387,13 +387,6 @@ sv_ev_room_message(ProfMessage* message)
         if (triggers) {
             mucwin->unread_triggers = TRUE;
         }
-
-	if (prefs_do_room_notify(is_current, mucwin->roomjid, mynick, message->from_jid->resourcepart, message->plain, mention, triggers != NULL)) {
-	     auto_jid Jid* jidp = jid_create(mucwin->roomjid);
-	     if (jidp) {
-		  notify_room_message(message->from_jid->resourcepart, jidp->localpart, num, message->plain);
-	     }
-	}
     }
 
     // save timestamp of last received muc message
@@ -402,6 +395,12 @@ sv_ev_room_message(ProfMessage* message)
     }
     mucwin->last_msg_timestamp = g_date_time_new_now_local();
 
+    if ((prefs_do_room_notify(is_current, mucwin->roomjid, mynick, message->from_jid->resourcepart, message->plain, mention, triggers != NULL) && !wins_is_current(window)) || ui_get_idle_time() > 1000) {
+        auto_jid Jid* jidp = jid_create(mucwin->roomjid);
+        if (jidp) {
+            notify_room_message(message->from_jid->resourcepart, jidp->localpart, num, message->plain);
+        }
+    }
 
     if (triggers) {
         g_list_free_full(triggers, free);

src/ui/chatwin.c

@@ -382,10 +382,6 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
         if (show_message) {
             win_print_incoming(window, display_name, message);
         }
-
-	if (notify) {
-	     notify_message(display_name, num, message->plain);
-	}
     }
 
     if (!message->is_mam) {
@@ -397,6 +393,9 @@ chatwin_incoming_msg(ProfChatWin* chatwin, ProfMessage* message, gboolean win_cr
         }
     }
 
+    if ((notify && !wins_is_current(window)) || ui_get_idle_time() > 1000) {
+        notify_message(display_name, num, message->plain);
+    }
     plugins_post_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, message->plain);
 
     message->plain = old_plain;