core: discussion views (fix #69)

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.32.2",
+    "version": "2.32.3",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",

packages/hydrooj/src/handler/discussion.ts

@@ -187,6 +187,12 @@ class DiscussionDetailHandler extends DiscussionHandler {
             if (drdoc.reply) uids.push(...drdoc.reply.map((drrdoc) => drrdoc.owner));
         }
         const udict = await user.getList(domainId, uids);
+        if (!dsdoc.view) {
+            await Promise.all([
+                discussion.inc(domainId, did, 'views', 1),
+                discussion.setStatus(domainId, did, this.user._id, { view: true }),
+            ]);
+        }
         const path = [
             ['Hydro', 'homepage'],
             ['discussion_main', 'discussion_main'],

packages/hydrooj/src/model/discussion.ts

@@ -9,6 +9,7 @@ import TaskModel from './task';
 import { DiscussionNodeNotFoundError, DocumentNotFoundError } from '../error';
 import { DiscussionReplyDoc, DiscussionTailReplyDoc, Document } from '../interface';
 import { buildProjection } from '../utils';
+import { NumberKeys } from '../typeutils';
 import * as bus from '../service/bus';
 
 export interface DiscussionDoc extends Document { }
@@ -112,6 +113,12 @@ export function edit(
     return document.set(domainId, document.TYPE_DISCUSSION, did, payload);
 }
 
+export function inc(
+    domainId: string, did: ObjectID, key: NumberKeys<DiscussionDoc>, value: number,
+): Promise<DiscussionDoc | null> {
+    return document.inc(domainId, document.TYPE_DISCUSSION, did, key, value);
+}
+
 export function del(domainId: string, did: ObjectID): Promise<never> {
     return Promise.all([
         document.deleteOne(domainId, document.TYPE_DISCUSSION, did),
@@ -221,6 +228,10 @@ export function getStatus(domainId: string, did: ObjectID, uid: number) {
     return document.getStatus(domainId, document.TYPE_DISCUSSION, did, uid);
 }
 
+export function setStatus(domainId: string, did: ObjectID, uid: number, $set) {
+    return document.setStatus(domainId, document.TYPE_DISCUSSION, did, uid, $set);
+}
+
 export function addNode(domainId: string, _id: string, category: string, args: any = {}) {
     return document.add(
         domainId, category, 1, document.TYPE_DISCUSSION_NODE,
@@ -327,6 +338,7 @@ global.Hydro.model.discussion = {
 
     add,
     get,
+    inc,
     edit,
     del,
     count,
@@ -344,6 +356,7 @@ global.Hydro.model.discussion = {
     react,
     setStar,
     getStatus,
+    setStatus,
     addNode,
     getNode,
     getNodes,

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.16.1",
+  "version": "4.16.2",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",

packages/ui-default/templates/discussion_detail.html

@@ -18,6 +18,7 @@
               {{ vnode['title'] }}
             </a>
           </li>
+          <li><h2>{{ ddoc.title }}</h2></li>
           <li>
             {{ user.render_inline(udict[ddoc.owner]) }}
             @
@@ -30,13 +31,11 @@
       </div>
       <ul class="section__footer supplementary dot list">
       {% if handler.user.hasPerm(perm.PERM_EDIT_DISCUSSION) or (handler.user.own(ddoc) and handler.user.hasPerm(perm.PERM_EDIT_DISCUSSION_SELF)) %}
-        <li>
+        <li><a href="{{ url('discussion_edit', did=ddoc.docId) }}">
-          <a href="{{ url('discussion_edit', did=ddoc.docId) }}"><span class="icon icon-edit"></span> {{ _('Edit') }}</a>
+          <span class="icon icon-edit"></span> {{ _('Edit') }}
-        </li>
+        </a></li>
       {% endif %}
-        <li>
+        <li>{{ _('{0} views').format(ddoc.views) }}</li>
-          {{ _('{0} views').format(ddoc.views) }}
-        </li>
       {% if handler.user.hasPriv(PRIV.PRIV_USER_PROFILE) %}
         <li><form class="form--inline" method="post">
           <input type="hidden" name="operation" value="{% if not dsdoc['star'] %}star{% else %}unstar{% endif %}">
@@ -47,9 +46,9 @@
           </button>
         </form></li>
       {% endif %}
-        <li>
+        <li><a href="{{ url('wiki_help', anchor='contact') }}">
-          <a href="{{ url('wiki_help', anchor='contact') }}"><span class="icon icon-warning"></span> {{ _('Report') }}</a>
+          <span class="icon icon-warning"></span> {{ _('Report') }}
-        </li>
+        </a></li>
       </ul>
     </div>
     <div class="section">