notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend] Fix typo

Browse source
This commit is contained in:
Laura Hausmann 2024-11-02 22:56:41 +01:00
parent 528bed3b9e
commit f2853d2d40
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
22 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Iceshrimp.Backend/Controllers/Mastodon/AnnouncementController.cs
View file

@ -75,7 +75,7 @@ public class AnnouncementController(DatabaseContext db, MfmConverter mfmConverte
{
var announcementRead = new AnnouncementRead
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Announcement = announcement,
User = user

2
Iceshrimp.Backend/Controllers/Mastodon/AuthController.cs
View file

@ -65,7 +65,7 @@ public class AuthController(DatabaseContext db, MetaService meta) : ControllerBa
var app = new OauthApp
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
ClientId = CryptographyHelpers.GenerateRandomString(32),
ClientSecret = CryptographyHelpers.GenerateRandomString(32),
CreatedAt = DateTime.UtcNow,

4
Iceshrimp.Backend/Controllers/Mastodon/ListController.cs
View file

@ -77,7 +77,7 @@ public class ListController(DatabaseContext db, UserRenderer userRenderer, Event
var user = HttpContext.GetUserOrFail();
var list = new UserList
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Name = request.Title,
@ -196,7 +196,7 @@ public class ListController(DatabaseContext db, UserRenderer userRenderer, Event
var memberships = subjects.Select(subject => new UserListMember
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
UserList = list,
UserId = subject

4
Iceshrimp.Backend/Controllers/Mastodon/PollController.cs
View file

@ -81,7 +81,7 @@ public class PollController(
var vote = new PollVote
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Note = note,
@ -100,7 +100,7 @@ public class PollController(
var vote = new PollVote
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Note = note,

2
Iceshrimp.Backend/Controllers/Mastodon/PushController.cs
View file

@ -39,7 +39,7 @@ public class PushController(DatabaseContext db, MetaService meta) : ControllerBa
{
pushSubscription = new PushSubscription
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Endpoint = request.Subscription.Endpoint,
User = token.User,

2
Iceshrimp.Backend/Controllers/Mastodon/StatusController.cs
View file

@ -666,7 +666,7 @@ public class StatusController(
var mute = new NoteThreadMuting
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
ThreadId = target,
UserId = user.Id

2
Iceshrimp.Backend/Controllers/Web/AdminController.cs
View file

@ -49,7 +49,7 @@ public class AdminController(
{
var invite = new RegistrationInvite
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Code = CryptographyHelpers.GenerateRandomString(32)
};

2
Iceshrimp.Backend/Controllers/Web/AuthController.cs
View file

@ -67,7 +67,7 @@ public class AuthController(DatabaseContext db, UserService userSvc, UserRendere
{
session = new Session
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
UserId = user.Id,
Active = !settings.TwoFactorEnabled,
CreatedAt = DateTime.UtcNow,

2
Iceshrimp.Backend/Controllers/Web/NoteController.cs
View file

@ -473,7 +473,7 @@ public class NoteController(
var mute = new NoteThreadMuting
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
ThreadId = target,
UserId = user.Id

8
Iceshrimp.Backend/Core/Federation/ActivityPub/ActivityHandlerService.cs
View file

@ -377,7 +377,7 @@ public class ActivityHandlerService(
{
ASActor targetActor => new Bite
{
Id = IdHelpers.GenerateSlowflakeId(activity.PublishedAt),
Id = IdHelpers.GenerateSnowflakeId(activity.PublishedAt),
CreatedAt = activity.PublishedAt ?? DateTime.UtcNow,
Uri = activity.Id,
User = resolvedActor,
@ -386,7 +386,7 @@ public class ActivityHandlerService(
},
ASNote targetNote => new Bite
{
Id = IdHelpers.GenerateSlowflakeId(activity.PublishedAt),
Id = IdHelpers.GenerateSnowflakeId(activity.PublishedAt),
CreatedAt = activity.PublishedAt ?? DateTime.UtcNow,
Uri = activity.Id,
User = resolvedActor,
@ -395,7 +395,7 @@ public class ActivityHandlerService(
},
ASBite targetBite => new Bite
{
Id = IdHelpers.GenerateSlowflakeId(activity.PublishedAt),
Id = IdHelpers.GenerateSnowflakeId(activity.PublishedAt),
CreatedAt = activity.PublishedAt ?? DateTime.UtcNow,
Uri = activity.Id,
User = resolvedActor,
@ -407,7 +407,7 @@ public class ActivityHandlerService(
null => throw GracefulException.UnprocessableEntity($"Failed to resolve bite target {activity.Target.Id}"),
_ when activity.To?.Id != null => new Bite
{
Id = IdHelpers.GenerateSlowflakeId(activity.PublishedAt),
Id = IdHelpers.GenerateSnowflakeId(activity.PublishedAt),
CreatedAt = activity.PublishedAt ?? DateTime.UtcNow,
Uri = activity.Id,
User = resolvedActor,

2
Iceshrimp.Backend/Core/Helpers/IdHelpers.cs
View file

@ -6,7 +6,7 @@ public static class IdHelpers
{
private const long Time2000 = 946684800000;
public static string GenerateSlowflakeId(DateTime? createdAt = null)
public static string GenerateSnowflakeId(DateTime? createdAt = null)
{
if (createdAt?.Kind is not null and not DateTimeKind.Utc)
createdAt = createdAt.Value.ToUniversalTime();

6
Iceshrimp.Backend/Core/Services/BiteService.cs
View file

@ -12,7 +12,7 @@ public class BiteService(DatabaseContext db, ActivityPub.ActivityRenderer activi
{
var bite = new Bite
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
TargetBite = target
@ -35,7 +35,7 @@ public class BiteService(DatabaseContext db, ActivityPub.ActivityRenderer activi
{
var bite = new Bite
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
TargetNote = target
@ -58,7 +58,7 @@ public class BiteService(DatabaseContext db, ActivityPub.ActivityRenderer activi
{
var bite = new Bite
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
TargetUser = target

8
Iceshrimp.Backend/Core/Services/DriveService.cs
View file

@ -133,7 +133,7 @@ public class DriveService(
logger.LogDebug("Failed to download file from {uri}: {error}, storing as link", uri, e.Message);
file = new DriveFile
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
UserHost = user.Host,
@ -173,7 +173,7 @@ public class DriveService(
{
file = new DriveFile
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
UserHost = user.Host,
@ -314,7 +314,7 @@ public class DriveService(
file = new DriveFile
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
UserHost = user.Host,
@ -631,7 +631,7 @@ file static class DriveFileExtensions
return new DriveFile
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Blurhash = file.Blurhash,

6
Iceshrimp.Backend/Core/Services/EmojiService.cs
View file

@ -45,7 +45,7 @@ public partial class EmojiService(
};
var driveFile = await driveSvc.StoreFile(input, user, request, true);
var id = IdHelpers.GenerateSlowflakeId();
var id = IdHelpers.GenerateSnowflakeId();
var emoji = new Emoji
{
Id = id,
@ -76,7 +76,7 @@ public partial class EmojiService(
var emoji = new Emoji
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
Name = existing.Name,
UpdatedAt = DateTime.UtcNow,
OriginalUrl = driveFile.Url,
@ -126,7 +126,7 @@ public partial class EmojiService(
{
dbEmojo = new Emoji
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
Host = host,
Name = emojo.Name ?? throw new Exception("emojo.Name must not be null at this stage"),
UpdatedAt = DateTime.UtcNow,

2
Iceshrimp.Backend/Core/Services/InstanceService.cs
View file

@ -33,7 +33,7 @@ public class InstanceService(DatabaseContext db, HttpClient httpClient, ILogger<
{
instance = new Instance
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
Host = host,
CaughtAt = DateTime.UtcNow,
LastCommunicatedAt = DateTime.UtcNow

18
Iceshrimp.Backend/Core/Services/NoteService.cs
View file

@ -245,7 +245,7 @@ public class NoteService(
var combinedAltText = data.Attachments?.Select(p => p.Comment).Where(c => c != null);
policySvc.CallRewriteHooks(data, IRewritePolicy.HookLocationEnum.PostLogic);
var noteId = IdHelpers.GenerateSlowflakeId(data.CreatedAt);
var noteId = IdHelpers.GenerateSnowflakeId(data.CreatedAt);
var threadId = data.Reply?.ThreadId ?? noteId;
var thread = await db.NoteThreads.Where(t => t.Id == threadId).FirstOrDefaultAsync() ??
@ -456,7 +456,7 @@ public class NoteService(
var noteEdit = new NoteEdit
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
UpdatedAt = data.UpdatedAt ?? DateTime.UtcNow,
Note = note,
Text = note.Text,
@ -836,7 +836,7 @@ public class NoteService(
var vote = new PollVote
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = actor,
Note = reply,
@ -1069,7 +1069,7 @@ public class NoteService(
var bgDb = provider.GetRequiredService<DatabaseContext>();
var existing = await bgDb.Hashtags.Where(p => tags.Contains(p.Name)).Select(p => p.Name).ToListAsync();
var dbTags = tags.Except(existing)
.Select(p => new Hashtag { Id = IdHelpers.GenerateSlowflakeId(), Name = p });
.Select(p => new Hashtag { Id = IdHelpers.GenerateSnowflakeId(), Name = p });
await bgDb.UpsertRange(dbTags).On(p => p.Name).NoUpdate().RunAsync();
});
@ -1273,7 +1273,7 @@ public class NoteService(
var like = new NoteLike
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Note = note
@ -1382,7 +1382,7 @@ public class NoteService(
{
var bookmark = new NoteBookmark
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Note = note
@ -1416,7 +1416,7 @@ public class NoteService(
var pin = new UserNotePin
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
User = user,
Note = note
@ -1471,7 +1471,7 @@ public class NoteService(
var pins = notes.OfType<Note>()
.Select(p => new UserNotePin
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = p,
User = user
@ -1507,7 +1507,7 @@ public class NoteService(
var reaction = new NoteReaction
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = note,
User = user,

24
Iceshrimp.Backend/Core/Services/NotificationService.cs
View file

@ -27,7 +27,7 @@ public class NotificationService(
.Except(blocks)
.Select(p => new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = note,
NotifierId = note.UserId,
@ -69,7 +69,7 @@ public class NotificationService(
.Except(remote)
.Select(p => new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = note,
NotifierId = note.UserId,
@ -91,7 +91,7 @@ public class NotificationService(
.Where(p => p.IsLocalUser && p != note.User && p.HasInteractedWith(note))
.Select(p => new Notification
{
Id = IdHelpers.GenerateSlowflakeId(DateTime.UtcNow),
Id = IdHelpers.GenerateSnowflakeId(DateTime.UtcNow),
CreatedAt = DateTime.UtcNow,
Note = note,
NotifierId = note.UserId,
@ -115,7 +115,7 @@ public class NotificationService(
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = note,
Notifiee = note.User,
@ -135,7 +135,7 @@ public class NotificationService(
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = reaction.Note,
Notifiee = reaction.Note.User,
@ -155,7 +155,7 @@ public class NotificationService(
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Notifiee = followee,
Notifier = follower,
@ -174,7 +174,7 @@ public class NotificationService(
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
FollowRequest = followRequest,
Notifier = followRequest.Follower,
@ -194,7 +194,7 @@ public class NotificationService(
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Notifier = followRequest.Followee,
Notifiee = followRequest.Follower,
@ -211,7 +211,7 @@ public class NotificationService(
{
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Notifiee = (bite.TargetUser ?? bite.TargetNote?.User ?? bite.TargetBite?.User) ??
throw new InvalidOperationException("Null checks say one of these must not be null"),
@ -236,7 +236,7 @@ public class NotificationService(
.Distinct()
.Select(p => new Notification
{
Id = IdHelpers.GenerateSlowflakeId(DateTime.UtcNow),
Id = IdHelpers.GenerateSnowflakeId(DateTime.UtcNow),
CreatedAt = DateTime.UtcNow,
Notifiee = p,
Notifier = note.User,
@ -249,7 +249,7 @@ public class NotificationService(
{
notifications.Add(new Notification
{
Id = IdHelpers.GenerateSlowflakeId(DateTime.UtcNow),
Id = IdHelpers.GenerateSnowflakeId(DateTime.UtcNow),
CreatedAt = DateTime.UtcNow,
Notifiee = note.User,
Note = note,
@ -275,7 +275,7 @@ public class NotificationService(
var notification = new Notification
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Note = note.IsQuote ? note : note.Renote,
Notifiee = note.Renote.User,

2
Iceshrimp.Backend/Core/Services/RelayService.cs
View file

@ -21,7 +21,7 @@ public class RelayService(
var relay = new Relay
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
Inbox = uri,
Status = Relay.RelayStatus.Requesting
};

2
Iceshrimp.Backend/Core/Services/SystemUserService.cs
View file

@ -71,7 +71,7 @@ public class SystemUserService(ILogger<SystemUserService> logger, DatabaseContex
var keypair = RSA.Create(4096);
var user = new User
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Username = username,
UsernameLower = username.ToLowerInvariant(),

18
Iceshrimp.Backend/Core/Services/UserService.cs
View file

@ -165,7 +165,7 @@ public class UserService(
user = new User
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
LastFetchedAt = followupTaskSvc.IsBackgroundWorker ? null : DateTime.UtcNow,
DisplayName = actor.DisplayName,
@ -413,7 +413,7 @@ public class UserService(
var keypair = RSA.Create(4096);
var user = new User
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Username = username,
UsernameLower = username.ToLowerInvariant(),
@ -586,7 +586,7 @@ public class UserService(
var following = new Following
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Follower = request.Follower,
Followee = request.Followee,
@ -758,7 +758,7 @@ public class UserService(
var following = new Following
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Followee = followee,
Follower = follower,
@ -799,7 +799,7 @@ public class UserService(
var request = new FollowRequest
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
RequestId = requestId,
Followee = followee,
@ -827,7 +827,7 @@ public class UserService(
{
var following = new Following
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Followee = followee,
Follower = follower,
@ -1087,7 +1087,7 @@ public class UserService(
var bgDb = provider.GetRequiredService<DatabaseContext>();
var existing = await bgDb.Hashtags.Where(p => tags.Contains(p.Name)).Select(p => p.Name).ToListAsync();
var dbTags = tags.Except(existing)
.Select(p => new Hashtag { Id = IdHelpers.GenerateSlowflakeId(), Name = p });
.Select(p => new Hashtag { Id = IdHelpers.GenerateSnowflakeId(), Name = p });
await bgDb.UpsertRange(dbTags).On(p => p.Name).NoUpdate().RunAsync();
});
@ -1113,7 +1113,7 @@ public class UserService(
muting = new Muting
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Mutee = mutee,
Muter = muter,
@ -1149,7 +1149,7 @@ public class UserService(
var blocking = new Blocking
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
CreatedAt = DateTime.UtcNow,
Blockee = blockee,
Blocker = blocker

2
Iceshrimp.Backend/Pages/OAuth/Authorize.cshtml.cs
View file

@ -81,7 +81,7 @@ public class AuthorizeModel(DatabaseContext db) : PageModel
var token = new OauthToken
{
Id = IdHelpers.GenerateSlowflakeId(),
Id = IdHelpers.GenerateSnowflakeId(),
Active = false,
Code = CryptographyHelpers.GenerateRandomString(32),
Token = CryptographyHelpers.GenerateRandomString(32),

4
Iceshrimp.Tests/MockObjects.cs
View file

@ -12,7 +12,7 @@ public static class MockObjects
{
public static readonly ASActor ASActor = new()
{
Id = $"https://example.org/users/{IdHelpers.GenerateSlowflakeId()}",
Id = $"https://example.org/users/{IdHelpers.GenerateSnowflakeId()}",
Type = ASActor.Types.Person,
Url = new ASLink("https://example.org/@test"),
Username = "test",
@ -23,7 +23,7 @@ public static class MockObjects
WebfingerAddress = "test@example.org"
};
public static readonly User User = new() { Id = IdHelpers.GenerateSlowflakeId() };
public static readonly User User = new() { Id = IdHelpers.GenerateSnowflakeId() };
public static readonly RSA Keypair = RSA.Create(4096);