Merge branch 'v5' of https://github.com/crowbartools/Firebot into v5

Author: ebiggz

src/gui/app/services/activity-feed.service.js

@@ -16,7 +16,7 @@
 
             backendCommunicator.on("activity-feed:event-activity", (activity) => {
 
-                activity.message = $sce.trustAsHtml(sanitize(marked(activity.message)));
+                activity.message = $sce.trustAsHtml(sanitize(marked.parseInline(activity.message)));
 
                 service.allActivities.unshift(activity);
                 if (service.allActivities.length > 500) {

src/gui/app/templates/chat/_chat-messages.html

@@ -266,6 +266,9 @@ <h4><i class="fas" ng-class="currentThreadMessages().length < 2 ? 'fa-reply' : '
         <div
           class="activity-message"
           ng-bind-html="activity.message"
+          uib-tooltip-html="activity.message"
+          tooltip-append-to-body="true"
+          tooltip-placement="left"
         ></div>
         <div
           class="ml-4"

src/gui/scss/core/_chat.scss

@@ -822,15 +822,12 @@
 }
 
 .activity-message {
+    display: -webkit-box;
     flex-grow: 9999;
     overflow: hidden;
-}
-
-.activity-message > p:first-child {
-    margin: 0 !important;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-height: 40px;
+    line-clamp: 4;
+    -webkit-line-clamp: 4;
+    -webkit-box-orient: vertical;
 }
 
 .chat-window-column {