feat: Add username label on shared photos

Fixes pulsejet#955 Signed-off-by: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
jovanbulck · Aug 12, 2024 · d03d6fc · d03d6fc
1 parent a773471
commit d03d6fc
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 1 deletion.
diff --git a/lib/Db/TimelineQuery.php b/lib/Db/TimelineQuery.php
@@ -25,6 +25,7 @@ class TimelineQuery
         'f.etag', 'f.name AS basename',
         'f.size', 'm.epoch', // auid
         'mimetypes.mimetype',
+        'm.owner',
     ];
 
     protected ?TimelineRoot $_root = null; // cache

diff --git a/lib/Db/TimelineQueryDays.php b/lib/Db/TimelineQueryDays.php
@@ -7,6 +7,7 @@
 use OCA\Memories\ClustersBackend;
 use OCA\Memories\Exif;
 use OCA\Memories\Settings\SystemConfig;
+use OCA\Memories\Util;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
@@ -315,6 +316,10 @@ private function postProcessDayPhoto(array &$row, bool $monthView = false): void
             unset($row['liveid']);
         }
 
+        if ($row['owner'] === Util::getUID()) {
+            unset($row['owner']);
+        }
+
         // Favorite field, may not be present
         if ($row['categoryid'] ?? null) {
             $row['isfavorite'] = 1;

diff --git a/lib/Db/TimelineWrite.php b/lib/Db/TimelineWrite.php
@@ -72,6 +72,7 @@ public function processFile(
         // Get parameters
         $mtime = $file->getMtime();
         $fileId = $file->getId();
+        $owner = $file->getOwner()?->getUID();
         $isvideo = Index::isVideo($file);
 
         // Get previous row
@@ -172,6 +173,7 @@ public function processFile(
             'orphan' => $query->createNamedParameter(false, IQueryBuilder::PARAM_BOOL),
             'buid' => $query->createNamedParameter($buid, IQueryBuilder::PARAM_STR),
             'parent' => $query->createNamedParameter($file->getParent()->getId(), IQueryBuilder::PARAM_INT),
+            'owner' => $query->createNamedParameter($owner, IQueryBuilder::PARAM_STR),
         ];
 
         // There is no easy way to UPSERT in standard SQL

diff --git a/src/components/frame/Photo.vue b/src/components/frame/Photo.vue
@@ -29,11 +29,16 @@
         </div>
       </div>
 
-      <div class="flag bottom-left">
+      <div class="flag bottom-right">
         <StarIcon :size="22" v-if="data.flag & c.FLAG_IS_FAVORITE" />
         <LocalIcon :size="22" v-if="data.flag & c.FLAG_IS_LOCAL" />
       </div>
 
+      <div class="flag bottom-left">
+        <AccountMultipleIcon :size="22" v-if="data.owner" />
+        <span class="username" v-if="data.owner" >{{ owner }}</span>
+      </div>
+
       <div
         class="img-outer fill-block"
         :class="{ 'memories-livephoto': data.liveid }"
@@ -81,6 +86,7 @@ import StarIcon from 'vue-material-design-icons/Star.vue';
 import VideoIcon from 'vue-material-design-icons/PlayCircleOutline.vue';
 import LocalIcon from 'vue-material-design-icons/CloudOff.vue';
 import RawIcon from 'vue-material-design-icons/Raw.vue';
+import AccountMultipleIcon from 'vue-material-design-icons/AccountMultiple.vue'
 
 import type { IDay, IPhoto } from '@typings';
 import type XImg from '@components/XImg.vue';
@@ -96,6 +102,7 @@ export default defineComponent({
     StarIcon,
     LocalIcon,
     RawIcon,
+    AccountMultipleIcon
   },
 
   props: {
@@ -173,6 +180,11 @@ export default defineComponent({
       return null;
     },
 
+    owner(): string | null {
+      return this.data.owner || null;
+    },
+
+
     videoUrl(): string | null {
       if (this.data.liveid) {
         return utils.getLivePhotoVideoUrl(this.data, true);
@@ -414,6 +426,19 @@ $icon-size: $icon-half-size * 2;
     }
   }
 
+  &.bottom-right {
+    bottom: var(--icon-dist);
+    right: var(--icon-dist);
+    .p-outer.selected > & {
+      transform: translate($icon-size, -$icon-size);
+    }
+  }
+
+  > .username {
+    font-size: 0.75em;
+    margin-left: 3px;
+  }
+
   > .video {
     display: flex;
     line-height: 22px; // force text height to match

diff --git a/src/typings/data.d.ts b/src/typings/data.d.ts
@@ -99,6 +99,8 @@ declare module '@typings' {
 
     /** Stacked RAW photos */
     stackraw?: IPhoto[];
+
+    owner?: string;
   };
 
   export interface IImageInfo {