Add support for images in recent activities

Author: BurntimeX

com.woltlab.wcf/templates/recentActivityListItem.tpl

@@ -2,7 +2,8 @@
 	<div class="
 		recentActivityListItem
 		{if $event->isIgnoredContent()}ignoredUserContent{/if}
-		{if !$event->getDescription()}recentActivityListItem--compact{/if}
+		{if $event->getDescription()}recentActivityListItem--withDescription{/if}
+		{if $event->getImage()}recentActivityListItem--withImage{/if}
 	">
 		<div class="recentActivityListItem__avatar">
 			{user object=$event->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
@@ -22,6 +23,12 @@
 			</div>
 		{/if}
 
+		{if $event->getImage()}
+			<div class="recentActivityListItem__image">
+				<img src="{$event->getImage()}" loading="lazy">
+			</div>
+		{/if}
+
 		<div class="recentActivityListItem__time">
 			{time time=$event->time}
 		</div>

wcfsetup/install/files/lib/data/user/activity/event/ViewableUserActivityEvent.class.php

@@ -66,6 +66,11 @@ class ViewableUserActivityEvent extends DatabaseObjectDecorator
      */
     protected string $link = '';
 
+    /**
+     * @since 6.2
+     */
+    protected string $image = '';
+
     /**
      * Marks this event as accessible for current user.
      */
@@ -213,4 +218,20 @@ public function isIgnoredContent(): bool
     {
         return UserProfileHandler::getInstance()->getUserProfile()->isIgnoredUser($this->getUserProfile()->userID, 2);
     }
+
+    /**
+     * @since 6.2
+     */
+    public function setImage(string $image): void
+    {
+        $this->image = $image;
+    }
+
+    /**
+     * @since 6.2
+     */
+    public function getImage(): string
+    {
+        return $this->image;
+    }
 }

wcfsetup/install/files/lib/system/message/embedded/object/MessageEmbeddedObjectManager.class.php

@@ -371,7 +371,7 @@ public function getActiveMessageID(): ?int
     }
 
     /**
-     * Returns all embedded objects of a specific type.
+     * Returns all embedded objects of a specific type in the active message.
      *
      * @param string $embeddedObjectType
      * @return  array
@@ -392,6 +392,29 @@ public function getObjects($embeddedObjectType)
         return $returnValue;
     }
 
+    /**
+     * Returns all embedded objects of a specific type in a specific message.
+     *
+     * @since 6.2
+     */
+    public function getObjectsForMessage(string $embeddedObjectType, string $messageObjectType, int $messageID): array
+    {
+        $embeddedObjectTypeID = ObjectTypeCache::getInstance()
+            ->getObjectTypeIDByName('com.woltlab.wcf.message.embeddedObject', $embeddedObjectType);
+        $messageObjectTypeID = ObjectTypeCache::getInstance()
+            ->getObjectTypeIDByName('com.woltlab.wcf.message', $messageObjectType);
+        $returnValue = [];
+        if (!empty($this->messageEmbeddedObjects[$messageObjectTypeID][$messageID][$embeddedObjectTypeID])) {
+            foreach ($this->messageEmbeddedObjects[$messageObjectTypeID][$messageID][$embeddedObjectTypeID] as $embeddedObjectID) {
+                if (isset($this->embeddedObjects[$embeddedObjectTypeID][$embeddedObjectID])) {
+                    $returnValue[] = $this->embeddedObjects[$embeddedObjectTypeID][$embeddedObjectID];
+                }
+            }
+        }
+
+        return $returnValue;
+    }
+
     /**
      * Returns a specific embedded object.
      *

wcfsetup/install/files/lib/system/user/activity/event/ArticleUserActivityEvent.class.php

@@ -47,6 +47,9 @@ public function prepare(array $events)
                     ));
                     $event->setDescription(\strip_tags($article->getFormattedTeaser()), true);
                     $event->setLink($article->getLink());
+                    if ($article->getTeaserImage()) {
+                        $event->setImage($article->getTeaserImage()->getThumbnailLink('medium'));
+                    }
                 }
             } else {
                 $event->setIsOrphaned();

wcfsetup/install/files/style/ui/recentActivityList.scss

@@ -10,25 +10,62 @@
 
 .recentActivityListItem {
 	display: grid;
+	column-gap: 15px;
+	row-gap: 5px;
+	position: relative;
 	grid-template-areas:
 		"avatar title"
-		"avatar description"
 		"avatar time";
 	grid-template-columns: min-content 1fr;
-	column-gap: 15px;
-	row-gap: 5px;
-	position: relative;
+	grid-template-rows: min-content 1fr;
 
-	&.recentActivityListItem--compact {
+	&.recentActivityListItem--withDescription {
 		grid-template-areas:
 			"avatar title"
+			"avatar description"
 			"avatar time";
+		grid-template-rows: min-content min-content 1fr;
 	}
 
 	&:not(:last-child) {
 		padding-bottom: 20px;
 		border-bottom: 1px solid var(--wcfContentBorderInner);
 	}
+
+	@include screen-md-up {
+		&.recentActivityListItem--withImage {
+			grid-template-areas:
+				"avatar title image"
+				"avatar time image";
+			grid-template-columns: min-content 1fr min-content;
+		}
+
+		&.recentActivityListItem--withDescription.recentActivityListItem--withImage {
+			grid-template-areas:
+				"avatar title image"
+				"avatar description image"
+				"avatar time image";
+		}
+	}
+
+	@include screen-sm-down {
+		&.recentActivityListItem--withImage {
+			grid-template-areas:
+				"avatar title"
+				"avatar image"
+				"avatar time";
+			grid-template-rows: min-content min-content 1fr;
+		}
+
+		&.recentActivityListItem--withDescription.recentActivityListItem--withImage {
+			grid-template-areas:
+				"avatar title"
+				"avatar image"
+				"avatar description"
+				"avatar time";
+			grid-template-rows: min-content min-content min-content 1fr;
+		}
+	}
 }
 
 .recentActivityListItem__avatar {
@@ -53,6 +90,20 @@
 	@include wcfFontSmall;
 }
 
+.recentActivityListItem__image {
+	grid-area: image;
+	align-self: center;
+}
+
+.recentActivityListItem__image img {
+	border-radius: var(--wcfBorderRadius);
+	max-width: 300px;
+
+	@include screen-sm-down {
+		max-width: 100%;
+	}
+}
+
 .recentActivityListItem__link {
 	color: inherit;