CalvinBackup/notesnook-sync-server_customPrivateV1
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook-sync-server.git synced 2026-02-12 11:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

monographs: track view count (#67)

Browse Source
This commit is contained in:
01zulfi
2025-11-06 13:15:23 +05:00
committed by GitHub
parent 55136597aa
commit 294769fd71
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Notesnook.API/Controllers/MonographsController.cs
View File

@@ -26,6 +26,7 @@ using System.Threading.Tasks;
using AngleSharp; using AngleSharp;
using AngleSharp.Dom; using AngleSharp.Dom;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using MongoDB.Bson; using MongoDB.Bson;
@@ -117,6 +118,7 @@ namespace Notesnook.API.Controllers
monograph.Id = existingMonograph.Id; monograph.Id = existingMonograph.Id;
} }
monograph.Deleted = false; monograph.Deleted = false;
monograph.ViewCount = 0;
await monographs.Collection.ReplaceOneAsync( await monographs.Collection.ReplaceOneAsync(
CreateMonographFilter(userId, monograph), CreateMonographFilter(userId, monograph),
monograph, monograph,
@@ -129,6 +131,7 @@ namespace Notesnook.API.Controllers
{ {
id = monograph.ItemId, id = monograph.ItemId,
datePublished = monograph.DatePublished, datePublished = monograph.DatePublished,
viewCount = monograph.ViewCount
}); });
} }
catch (Exception e) catch (Exception e)
@@ -170,6 +173,7 @@ namespace Notesnook.API.Controllers
.Set(m => m.SelfDestruct, monograph.SelfDestruct) .Set(m => m.SelfDestruct, monograph.SelfDestruct)
.Set(m => m.Title, monograph.Title) .Set(m => m.Title, monograph.Title)
.Set(m => m.Password, monograph.Password) .Set(m => m.Password, monograph.Password)
.Set(m => m.ViewCount, monograph.ViewCount)
); );
if (!result.IsAcknowledged) return BadRequest(); if (!result.IsAcknowledged) return BadRequest();
@@ -179,6 +183,7 @@ namespace Notesnook.API.Controllers
{ {
id = monograph.ItemId, id = monograph.ItemId,
datePublished = monograph.DatePublished, datePublished = monograph.DatePublished,
viewCount = monograph.ViewCount
}); });
} }
catch (Exception e) catch (Exception e)
@@ -232,6 +237,9 @@ namespace Notesnook.API.Controllers
var monograph = await FindMonographAsync(id); var monograph = await FindMonographAsync(id);
if (monograph == null || monograph.Deleted) return Content(SVG_PIXEL, "image/svg+xml"); if (monograph == null || monograph.Deleted) return Content(SVG_PIXEL, "image/svg+xml");
var cookieName = $"viewed_{id}";
var hasVisitedBefore = Request.Cookies.ContainsKey(cookieName);
if (monograph.SelfDestruct) if (monograph.SelfDestruct)
{ {
await monographs.Collection.ReplaceOneAsync( await monographs.Collection.ReplaceOneAsync(
@@ -241,9 +249,27 @@ namespace Notesnook.API.Controllers
ItemId = id, ItemId = id,
Id = monograph.Id, Id = monograph.Id,
Deleted = true, Deleted = true,
UserId = monograph.UserId UserId = monograph.UserId,
ViewCount = 0
} }
); );
await MarkMonographForSyncAsync(monograph.UserId, id);
}
else if (!hasVisitedBefore)
{
await monographs.Collection.UpdateOneAsync(
CreateMonographFilter(monograph.UserId, monograph),
Builders<Monograph>.Update.Inc(m => m.ViewCount, 1)
);
var cookieOptions = new CookieOptions
{
Path = $"/monographs/{id}",
HttpOnly = true,
Secure = Request.IsHttps,
Expires = DateTimeOffset.UtcNow.AddMonths(1)
};
Response.Cookies.Append(cookieName, "1", cookieOptions);
await MarkMonographForSyncAsync(monograph.UserId, id); await MarkMonographForSyncAsync(monograph.UserId, id);
} }
@@ -269,7 +295,8 @@ namespace Notesnook.API.Controllers
ItemId = id, ItemId = id,
Id = monograph.Id, Id = monograph.Id,
Deleted = true, Deleted = true,
UserId = monograph.UserId UserId = monograph.UserId,
ViewCount = 0
} }
); );

1
Notesnook.API/Hubs/SyncV2Hub.cs
View File

@@ -283,6 +283,7 @@ namespace Notesnook.API.Hubs
SelfDestruct = m.SelfDestruct, SelfDestruct = m.SelfDestruct,
Title = m.Title, Title = m.Title,
ItemId = m.ItemId ?? m.Id.ToString(), ItemId = m.ItemId ?? m.Id.ToString(),
ViewCount = m.ViewCount
}).ToListAsync(); }).ToListAsync();
if (userMonographs.Count > 0 && !await Clients.Caller.SendMonographs(userMonographs).WaitAsync(TimeSpan.FromMinutes(10))) if (userMonographs.Count > 0 && !await Clients.Caller.SendMonographs(userMonographs).WaitAsync(TimeSpan.FromMinutes(10)))

3
Notesnook.API/Models/Monograph.cs
View File

@@ -80,5 +80,8 @@ namespace Notesnook.API.Models
[JsonPropertyName("deleted")] [JsonPropertyName("deleted")]
public bool Deleted { get; set; } public bool Deleted { get; set; }
[JsonPropertyName("viewCount")]
public int ViewCount { get; set; }
} }
} }

3
Notesnook.API/Models/MonographMetadata.cs
View File

@@ -48,5 +48,8 @@ namespace Notesnook.API.Models
[JsonPropertyName("deleted")] [JsonPropertyName("deleted")]
public bool Deleted { get; set; } public bool Deleted { get; set; }
[JsonPropertyName("viewCount")]
public int ViewCount { get; set; }
} }
} }