Timeline improvements

db/models.py

@@ -223,6 +223,14 @@ class TimelineEvent(BaseModel):
         backref="timeline_events"
     )
 
+    actor = ForeignKeyField(
+        User,
+        column_name='actor_user_id',
+        field='id',
+        null=True,
+        backref="timeline_events_actor"
+    )
+
     orders_pool = ForeignKeyField(
         OrdersPool,
         column_name='orders_pool_id',

db/queries.py

@@ -164,7 +164,7 @@ def order_status_outstanding():
     .having(fn.COUNT(Punishment.id) == 0)
   )
 
-def timeline_event_put(type, text, user, orders_pool=None, order_status=None, extra=None):
+def timeline_event_put(type, text, user, orders_pool=None, order_status=None, actor=None, extra=None):
   return TimelineEvent.create(
     updated_at=sqlite_time(datetime.datetime.now(datetime.UTC)),
     type=type,
@@ -172,13 +172,17 @@ def timeline_event_put(type, text, user, orders_pool=None, order_status=None, ex
     user=user,
     orders_pool=orders_pool,
     order_status=order_status,
+    actor=actor,
     extra=json.dumps(extra) if extra is not None else None
   )
 
-def timeline_event_recent(user_id):
+def timeline_event_recent(user_ids, actor_ids=None):
   return (TimelineEvent
           .select()
-          .where(TimelineEvent.user_id == user_id)
+          .where((
+            TimelineEvent.user_id.in_(user_ids) |
+            (TimelineEvent.actor_user_id.in_(actor_ids) if actor_ids is not None else True)
+          ))
           .order_by(TimelineEvent.updated_at.desc())
           .limit(10)
   )

main.py

@@ -14,8 +14,8 @@ from telegram.commands import commands
 
 logger = logging.getLogger(__name__)
 
-async def do_order_issue(order_pool_id):
+async def do_order_issue(orders_pool_id):
-    orders_pool = orders_pool_by_id(args.orders_pool_id)
+    orders_pool = orders_pool_by_id(orders_pool_id)
 
     issue_result = await order_issue(orders_pool)
 

migrations/024_timeline_event_add_actor.py

@@ -0,0 +1,53 @@
+"""Peewee migrations -- 024_timeline_event_add_actor.py.
+
+Some examples (model - class or model name)::
+
+    > Model = migrator.orm['table_name']            # Return model in current state by name
+    > Model = migrator.ModelClass                   # Return model in current state by name
+
+    > migrator.sql(sql)                             # Run custom SQL
+    > migrator.run(func, *args, **kwargs)           # Run python function with the given args
+    > migrator.create_model(Model)                  # Create a model (could be used as decorator)
+    > migrator.remove_model(model, cascade=True)    # Remove a model
+    > migrator.add_fields(model, **fields)          # Add fields to a model
+    > migrator.change_fields(model, **fields)       # Change fields
+    > migrator.remove_fields(model, *field_names, cascade=True)
+    > migrator.rename_field(model, old_field_name, new_field_name)
+    > migrator.rename_table(model, new_table_name)
+    > migrator.add_index(model, *col_names, unique=False)
+    > migrator.add_not_null(model, *field_names)
+    > migrator.add_default(model, field_name, default)
+    > migrator.add_constraint(model, name, sql)
+    > migrator.drop_index(model, *col_names)
+    > migrator.drop_not_null(model, *field_names)
+    > migrator.drop_constraints(model, *constraints)
+
+"""
+
+from contextlib import suppress
+
+import peewee as pw
+from peewee_migrate import Migrator
+
+
+with suppress(ImportError):
+    import playhouse.postgres_ext as pw_pext
+
+
+def migrate(migrator: Migrator, database: pw.Database, *, fake=False):
+    """Write your migrations here."""
+    
+    migrator.add_fields(
+        'timeline_event',
+
+        actor=pw.ForeignKeyField(column_name='actor_user_id', field='id', model=migrator.orm['user'], null=True))
+
+    # migrator.add_index('timeline_event', 'actor', unique=False)
+
+
+def rollback(migrator: Migrator, database: pw.Database, *, fake=False):
+    """Write your rollback migrations here."""
+    
+    migrator.remove_fields('timeline_event', 'actor')
+
+    migrator.drop_index('timeline_event', 'actor')

web/api.py

@@ -56,6 +56,9 @@ def maybe_json(str):
 @api.route('/timeline')
 @login_required
 def timeline():
+  subs = [dsu.sub for dsu in domsubusers_list(current_user.db_user)]
+  subs.append(current_user.db_user)
+
   return jsonify([
     {
       "id": t.id,
@@ -64,12 +67,15 @@ def timeline():
       "text": t.text,
       "extra": maybe_json(t.extra),
       "username": t.user.telegram_username,
+      "actor_username": t.actor.telegram_username if t.actor is not None else None,
       "orders_pool": {
         "id": t.orders_pool.id,
         "name": t.orders_pool.name,
       } if t.orders_pool is not None else None,
       "order_status": t.order_status.text if t.order_status is not None else None,
-    } for t in timeline_event_recent(current_user.db_user.id)
+    } for t in timeline_event_recent(
+      subs,
+      [current_user.db_user.id,])
   ])
 
 @api.route('/mastodon_oauth')
@@ -236,8 +242,9 @@ def sub_order_set_create(username, sub):
       timeline_event_put(
         TIMELINE_ORDERS_POOL_CREATED,
         new_order_pool.name,
-        current_user.db_user,
+        sub,
-        new_order_pool
+        new_order_pool,
+        actor=current_user.db_user
       )
     except Exception as e:
       print(e)
@@ -327,8 +334,9 @@ def sub_order_set(username, set_id, sub):
         timeline_event_put(
           TIMELINE_ORDERS_POOL_UPDATED,
           op.name,
-          current_user.db_user,
+          sub,
-          op
+          op,
+          actor=current_user.db_user
         )
       except Exception as e:
         print(e)
@@ -341,7 +349,8 @@ def sub_order_set(username, set_id, sub):
       timeline_event_put(
         TIMELINE_ORDERS_POOL_DELETED,
         op.name,
-        current_user.db_user
+        sub,
+        actor=current_user.db_user
       )
 
       return ('', 204)

web/vite/src/TimelineList.tsx

@@ -6,11 +6,12 @@ import {
   IconAlertCircle,
   IconArrowBadgeRightFilled,
   IconCheck,
+  IconCrown,
   IconExternalLink,
   IconFileDiff,
   IconFileMinus,
   IconFilePlus,
-  IconPlaylistAdd,
+  IconLock,
   IconX,
 } from "@tabler/icons-react";
 
@@ -64,16 +65,25 @@ export const TimelineList: React.FC<{
     <Title order={1} mb="lg">
       Timeline
     </Title>
-    <Timeline bulletSize={24} lineWidth={2}>
+    <Timeline bulletSize={24} lineWidth={2} my="lg">
       {timeline.map(
-        ({ id, updated_at, type, text, username, orders_pool, extra }) => (
+        ({
+          id,
+          updated_at,
+          type,
+          text,
+          username,
+          actor_username,
+          orders_pool,
+          extra,
+        }) => (
           <Timeline.Item key={id} active {...(TIMELINE_TYPE[type] ?? {})}>
             <Text size="sm">{text}</Text>
             <Flex mt={4} gap="xs">
               {extra?.mastodon_status_url ? (
                 <Text size="xs">
                   <a href={extra.mastodon_status_url} target="_blank">
-                    Mastodon Post <IconExternalLink size="0.8rem" />
+                    Mastodon Post <IconExternalLink size="0.75rem" />
                   </a>
                 </Text>
               ) : null}
@@ -84,6 +94,14 @@ export const TimelineList: React.FC<{
                   </Link>
                 </Text>
               ) : null}
+              {actor_username ? (
+                <Text size="xs">
+                  <IconCrown size="0.75rem" /> {actor_username}
+                </Text>
+              ) : null}
+              <Text size="xs">
+                <IconLock size="0.75rem" /> {username}
+              </Text>
               <Text size="xs">{moment(updated_at).fromNow()}</Text>
             </Flex>
           </Timeline.Item>

web/vite/src/index.d.ts

@@ -32,6 +32,7 @@ type TimelineEvent = {
     text: string;
     extra: Record<string, string>;
     username: string;
+    actor_username?: string;
     orders_pool: Pick<OrderSet, "id" | "name">;
     order_status: string;
 }