From 1874a32728142f2c12724562eb122eb1cd1370fe Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 Jan 2023 09:36:24 -0500 Subject: [PATCH] Happy New Year 2023! --- bin/auth_ejabberd.php | 2 +- bin/console.php | 2 +- bin/daemon.php | 2 +- bin/testargs.php | 2 +- bin/wait-for-connection | 2 +- bin/worker.php | 2 +- index.php | 2 +- mod/item.php | 2 +- mod/lostpass.php | 2 +- mod/message.php | 2 +- mod/notes.php | 2 +- mod/oexchange.php | 2 +- mod/photos.php | 2 +- mod/update_contact.php | 2 +- mod/update_notes.php | 2 +- mods/fpostit/fpostit.php | 2 +- src/App.php | 2 +- src/App/Arguments.php | 2 +- src/App/BaseURL.php | 2 +- src/App/Mode.php | 2 +- src/App/Page.php | 2 +- src/App/Request.php | 2 +- src/App/Router.php | 2 +- src/BaseCollection.php | 2 +- src/BaseDataTransferObject.php | 2 +- src/BaseEntity.php | 2 +- src/BaseFactory.php | 2 +- src/BaseModel.php | 2 +- src/BaseModule.php | 2 +- src/BaseRepository.php | 2 +- src/Capabilities/ICanCreateFromTableRow.php | 2 +- src/Capabilities/ICanCreateResponses.php | 2 +- src/Capabilities/ICanHandleRequests.php | 2 +- src/Collection/Api/Mastodon/Emojis.php | 2 +- src/Collection/Api/Mastodon/Fields.php | 2 +- src/Collection/Api/Mastodon/Mentions.php | 2 +- src/Collection/Api/Notifications.php | 2 +- src/Console/Addon.php | 2 +- src/Console/ArchiveContact.php | 2 +- src/Console/AutomaticInstallation.php | 2 +- src/Console/Cache.php | 2 +- src/Console/Config.php | 2 +- src/Console/Contact.php | 2 +- src/Console/CreateDoxygen.php | 2 +- src/Console/DatabaseStructure.php | 2 +- src/Console/DocBloxErrorChecker.php | 2 +- src/Console/Extract.php | 2 +- .../FixAPDeliveryWorkerTaskParameters.php | 2 +- src/Console/GlobalCommunityBlock.php | 2 +- src/Console/GlobalCommunitySilence.php | 2 +- src/Console/Lock.php | 2 +- src/Console/Maintenance.php | 2 +- src/Console/MergeContacts.php | 2 +- src/Console/MoveToAvatarCache.php | 2 +- src/Console/PhpToPo.php | 4 +-- src/Console/PoToPhp.php | 2 +- src/Console/PostUpdate.php | 2 +- src/Console/Relay.php | 2 +- src/Console/Relocate.php | 2 +- src/Console/ServerBlock.php | 2 +- src/Console/Storage.php | 2 +- src/Console/Test.php | 2 +- src/Console/Typo.php | 2 +- src/Console/User.php | 2 +- src/Contact/Avatar.php | 2 +- .../Collection/FriendSuggests.php | 2 +- .../FriendSuggest/Entity/FriendSuggest.php | 2 +- .../FriendSuggestNotFoundException.php | 2 +- .../FriendSuggestPersistenceException.php | 2 +- .../FriendSuggest/Factory/FriendSuggest.php | 2 +- .../Repository/FriendSuggest.php | 2 +- .../Introduction/Collection/Introductions.php | 2 +- .../Introduction/Entity/Introduction.php | 2 +- .../IntroductionNotFoundException.php | 2 +- .../IntroductionPersistenceException.php | 2 +- .../Introduction/Factory/Introduction.php | 2 +- .../Introduction/Repository/Introduction.php | 2 +- .../Entity/LocalRelationship.php | 2 +- .../LocalRelationshipPersistenceException.php | 2 +- .../Factory/LocalRelationship.php | 2 +- .../Repository/LocalRelationship.php | 2 +- src/Content/BoundariesPager.php | 2 +- src/Content/ContactSelector.php | 2 +- src/Content/Conversation.php | 2 +- src/Content/Feature.php | 2 +- src/Content/ForumManager.php | 6 ++--- src/Content/Item.php | 2 +- src/Content/Nav.php | 2 +- src/Content/OEmbed.php | 2 +- src/Content/PageInfo.php | 2 +- src/Content/Pager.php | 2 +- src/Content/Smilies.php | 2 +- src/Content/Text/BBCode.php | 2 +- src/Content/Text/BBCode/Video.php | 2 +- src/Content/Text/HTML.php | 2 +- .../Text/HTMLPurifier_URIScheme_cid.php | 2 +- src/Content/Text/Markdown.php | 2 +- src/Content/Text/MarkdownParser.php | 2 +- src/Content/Text/Plaintext.php | 2 +- src/Content/Widget.php | 2 +- src/Content/Widget/CalendarExport.php | 2 +- src/Content/Widget/ContactBlock.php | 2 +- src/Content/Widget/SavedSearches.php | 2 +- src/Content/Widget/TagCloud.php | 2 +- src/Content/Widget/TrendingTags.php | 2 +- src/Content/Widget/VCard.php | 2 +- src/Core/ACL.php | 2 +- src/Core/Addon.php | 2 +- src/Core/Cache/Capability/ICanCache.php | 2 +- .../Cache/Capability/ICanCacheInMemory.php | 2 +- src/Core/Cache/Enum/Duration.php | 2 +- src/Core/Cache/Enum/Type.php | 2 +- .../Exception/CachePersistenceException.php | 2 +- .../Exception/InvalidCacheDriverException.php | 2 +- src/Core/Cache/Factory/Cache.php | 2 +- src/Core/Cache/Type/APCuCache.php | 2 +- src/Core/Cache/Type/AbstractCache.php | 2 +- src/Core/Cache/Type/ArrayCache.php | 2 +- src/Core/Cache/Type/CompareDeleteTrait.php | 2 +- src/Core/Cache/Type/CompareSetTrait.php | 2 +- src/Core/Cache/Type/DatabaseCache.php | 2 +- src/Core/Cache/Type/MemcacheCache.php | 2 +- src/Core/Cache/Type/MemcacheCommandTrait.php | 2 +- src/Core/Cache/Type/MemcachedCache.php | 2 +- .../Cache/Type/ProfilerCacheDecorator.php | 2 +- src/Core/Cache/Type/RedisCache.php | 2 +- .../Config/Capability/IManageConfigValues.php | 2 +- .../Config/Exception/ConfigFileException.php | 2 +- .../Exception/ConfigPersistenceException.php | 2 +- src/Core/Config/Factory/Config.php | 2 +- src/Core/Config/Repository/Config.php | 2 +- src/Core/Config/Type/AbstractConfig.php | 2 +- src/Core/Config/Type/JitConfig.php | 2 +- src/Core/Config/Type/PreloadConfig.php | 2 +- src/Core/Config/Util/ConfigFileLoader.php | 2 +- src/Core/Config/Util/ValueConversion.php | 2 +- src/Core/Config/ValueObject/Cache.php | 2 +- src/Core/Console.php | 2 +- src/Core/Hook.php | 2 +- src/Core/Installer.php | 4 +-- .../Capabilities/IManageKeyValuePairs.php | 2 +- .../KeyValueStoragePersistenceException.php | 2 +- .../Type/AbstractKeyValueStorage.php | 2 +- .../Type/DBKeyValueStorage.php | 2 +- src/Core/L10n.php | 2 +- src/Core/Lock/Capability/ICanLock.php | 2 +- src/Core/Lock/Enum/Type.php | 2 +- .../Exception/InvalidLockDriverException.php | 2 +- .../Exception/LockPersistenceException.php | 2 +- src/Core/Lock/Factory/Lock.php | 2 +- src/Core/Lock/Type/AbstractLock.php | 2 +- src/Core/Lock/Type/CacheLock.php | 2 +- src/Core/Lock/Type/DatabaseLock.php | 2 +- src/Core/Lock/Type/SemaphoreLock.php | 2 +- src/Core/Logger.php | 2 +- .../Capabilities/IHaveCallIntrospections.php | 2 +- .../Logger/Exception/LogLevelException.php | 2 +- .../Exception/LoggerArgumentException.php | 2 +- src/Core/Logger/Exception/LoggerException.php | 2 +- src/Core/Logger/Factory/Logger.php | 2 +- src/Core/Logger/Handler/ErrorHandler.php | 2 +- src/Core/Logger/Type/AbstractLogger.php | 2 +- src/Core/Logger/Type/ProfilerLogger.php | 2 +- src/Core/Logger/Type/StreamLogger.php | 2 +- src/Core/Logger/Type/SyslogLogger.php | 2 +- src/Core/Logger/Type/WorkerLogger.php | 2 +- src/Core/Logger/Util/Introspection.php | 2 +- .../IManagePersonalConfigValues.php | 2 +- .../Exception/PConfigPersistenceException.php | 2 +- src/Core/PConfig/Factory/PConfig.php | 2 +- src/Core/PConfig/Repository/PConfig.php | 2 +- .../PConfig/Type/AbstractPConfigValues.php | 2 +- src/Core/PConfig/Type/JitPConfig.php | 2 +- src/Core/PConfig/Type/PreloadPConfig.php | 2 +- src/Core/PConfig/ValueObject/Cache.php | 2 +- src/Core/Protocol.php | 2 +- src/Core/Renderer.php | 2 +- src/Core/Search.php | 2 +- .../Session/Capability/IHandleSessions.php | 2 +- .../Capability/IHandleUserSessions.php | 2 +- src/Core/Session/Factory/Session.php | 2 +- .../Handler/AbstractSessionHandler.php | 2 +- src/Core/Session/Handler/Cache.php | 2 +- src/Core/Session/Handler/Database.php | 2 +- src/Core/Session/Model/UserSession.php | 2 +- src/Core/Session/Type/AbstractSession.php | 2 +- src/Core/Session/Type/ArraySession.php | 2 +- src/Core/Session/Type/Memory.php | 2 +- src/Core/Session/Type/Native.php | 2 +- .../Capability/ICanConfigureStorage.php | 2 +- .../Capability/ICanReadFromStorage.php | 2 +- .../Storage/Capability/ICanWriteToStorage.php | 2 +- .../InvalidClassStorageException.php | 2 +- .../Exception/ReferenceStorageException.php | 2 +- .../Storage/Exception/StorageException.php | 2 +- .../Storage/Repository/StorageManager.php | 2 +- src/Core/Storage/Type/Database.php | 2 +- src/Core/Storage/Type/ExternalResource.php | 2 +- src/Core/Storage/Type/Filesystem.php | 2 +- src/Core/Storage/Type/FilesystemConfig.php | 2 +- src/Core/Storage/Type/SystemResource.php | 2 +- src/Core/System.php | 2 +- src/Core/Theme.php | 4 +-- src/Core/Update.php | 2 +- src/Core/Worker.php | 2 +- src/Core/Worker/Cron.php | 2 +- src/Core/Worker/Daemon.php | 2 +- src/Core/Worker/Entity/Process.php | 2 +- .../Exception/ProcessPersistenceException.php | 2 +- src/Core/Worker/Factory/Process.php | 2 +- src/Core/Worker/IPC.php | 2 +- src/Core/Worker/Repository/Process.php | 2 +- src/DI.php | 2 +- src/Database/DBA.php | 4 +-- src/Database/DBStructure.php | 2 +- src/Database/Database.php | 2 +- src/Database/DatabaseException.php | 2 +- src/Database/Definition/DbaDefinition.php | 2 +- src/Database/Definition/ViewDefinition.php | 2 +- src/Database/PostUpdate.php | 2 +- src/Database/View.php | 2 +- src/Factory/Api/Friendica/Activities.php | 2 +- src/Factory/Api/Friendica/Group.php | 2 +- src/Factory/Api/Friendica/Photo.php | 2 +- src/Factory/Api/Mastodon/Account.php | 2 +- src/Factory/Api/Mastodon/Application.php | 2 +- src/Factory/Api/Mastodon/Attachment.php | 2 +- src/Factory/Api/Mastodon/Card.php | 2 +- src/Factory/Api/Mastodon/Conversation.php | 2 +- src/Factory/Api/Mastodon/Emoji.php | 2 +- src/Factory/Api/Mastodon/Error.php | 2 +- src/Factory/Api/Mastodon/Field.php | 2 +- src/Factory/Api/Mastodon/FollowRequest.php | 2 +- src/Factory/Api/Mastodon/ListEntity.php | 2 +- src/Factory/Api/Mastodon/Mention.php | 2 +- src/Factory/Api/Mastodon/Notification.php | 2 +- src/Factory/Api/Mastodon/Poll.php | 2 +- src/Factory/Api/Mastodon/Relationship.php | 2 +- src/Factory/Api/Mastodon/ScheduledStatus.php | 2 +- src/Factory/Api/Mastodon/Status.php | 2 +- src/Factory/Api/Mastodon/StatusSource.php | 2 +- src/Factory/Api/Mastodon/Subscription.php | 2 +- src/Factory/Api/Mastodon/Tag.php | 2 +- src/Factory/Api/Twitter/Attachment.php | 2 +- src/Factory/Api/Twitter/DirectMessage.php | 2 +- src/Factory/Api/Twitter/Hashtag.php | 2 +- src/Factory/Api/Twitter/Media.php | 2 +- src/Factory/Api/Twitter/Mention.php | 2 +- src/Factory/Api/Twitter/Status.php | 2 +- src/Factory/Api/Twitter/Url.php | 2 +- src/Factory/Api/Twitter/User.php | 2 +- src/LegacyModule.php | 2 +- src/Model/APContact.php | 2 +- src/Model/APContact/Endpoint.php | 2 +- src/Model/Attach.php | 2 +- src/Model/Contact.php | 2 +- src/Model/Contact/Group.php | 2 +- src/Model/Contact/Introduction.php | 2 +- src/Model/Contact/Relation.php | 10 +++---- src/Model/Contact/User.php | 2 +- src/Model/Conversation.php | 2 +- src/Model/Event.php | 2 +- src/Model/FileTag.php | 2 +- src/Model/GServer.php | 2 +- src/Model/Group.php | 2 +- src/Model/Item.php | 2 +- src/Model/ItemURI.php | 2 +- src/Model/Log/ParsedLogIterator.php | 2 +- src/Model/Mail.php | 2 +- src/Model/Nodeinfo.php | 2 +- src/Model/Notification/ObjectType.php | 2 +- src/Model/Notification/Type.php | 2 +- src/Model/OpenWebAuthToken.php | 2 +- src/Model/Photo.php | 2 +- src/Model/Post.php | 2 +- src/Model/Post/Activity.php | 2 +- src/Model/Post/Category.php | 2 +- src/Model/Post/Collection.php | 4 +-- src/Model/Post/Content.php | 2 +- src/Model/Post/Delayed.php | 2 +- src/Model/Post/Delivery.php | 2 +- src/Model/Post/DeliveryData.php | 2 +- src/Model/Post/History.php | 2 +- src/Model/Post/Link.php | 4 +-- src/Model/Post/Media.php | 2 +- src/Model/Post/Question.php | 2 +- src/Model/Post/QuestionOption.php | 2 +- src/Model/Post/Thread.php | 2 +- src/Model/Post/ThreadUser.php | 20 +++++++------- src/Model/Post/User.php | 4 +-- src/Model/Post/UserNotification.php | 4 +-- src/Model/Profile.php | 2 +- src/Model/PushSubscriber.php | 2 +- src/Model/Register.php | 2 +- src/Model/Search.php | 2 +- src/Model/Subscription.php | 2 +- src/Model/Tag.php | 2 +- src/Model/User.php | 2 +- src/Model/User/Cookie.php | 2 +- src/Model/Verb.php | 2 +- src/Moderation/DomainPatternBlocklist.php | 2 +- src/Moderation/Entity/Report.php | 2 +- src/Moderation/Factory/Report.php | 2 +- src/Moderation/Repository/Report.php | 2 +- src/Module/About.php | 2 +- .../AccountManagementControlDocument.php | 2 +- src/Module/Acctlink.php | 2 +- src/Module/ActivityPub/Featured.php | 2 +- src/Module/ActivityPub/Followers.php | 2 +- src/Module/ActivityPub/Following.php | 2 +- src/Module/ActivityPub/Inbox.php | 2 +- src/Module/ActivityPub/Objects.php | 2 +- src/Module/ActivityPub/Outbox.php | 2 +- src/Module/Admin/Addons/Details.php | 2 +- src/Module/Admin/Addons/Index.php | 2 +- src/Module/Admin/DBSync.php | 2 +- src/Module/Admin/Features.php | 2 +- src/Module/Admin/Federation.php | 2 +- src/Module/Admin/Logs/Settings.php | 2 +- src/Module/Admin/Logs/View.php | 2 +- src/Module/Admin/PhpInfo.php | 2 +- src/Module/Admin/Queue.php | 2 +- src/Module/Admin/Site.php | 2 +- src/Module/Admin/Storage.php | 2 +- src/Module/Admin/Summary.php | 2 +- src/Module/Admin/Themes/Details.php | 2 +- src/Module/Admin/Themes/Embed.php | 2 +- src/Module/Admin/Themes/Index.php | 2 +- src/Module/Admin/Tos.php | 2 +- src/Module/Api/ApiResponse.php | 2 +- src/Module/Api/Friendica/Activity.php | 2 +- .../Api/Friendica/DirectMessages/Search.php | 2 +- .../Api/Friendica/DirectMessages/Setseen.php | 2 +- src/Module/Api/Friendica/Events/Create.php | 2 +- src/Module/Api/Friendica/Events/Delete.php | 2 +- src/Module/Api/Friendica/Events/Index.php | 2 +- src/Module/Api/Friendica/Group/Create.php | 2 +- src/Module/Api/Friendica/Group/Delete.php | 2 +- src/Module/Api/Friendica/Group/Show.php | 2 +- src/Module/Api/Friendica/Group/Update.php | 2 +- src/Module/Api/Friendica/Notification.php | 2 +- .../Api/Friendica/Notification/Seen.php | 2 +- src/Module/Api/Friendica/Photo.php | 2 +- src/Module/Api/Friendica/Photo/Create.php | 2 +- src/Module/Api/Friendica/Photo/Delete.php | 2 +- src/Module/Api/Friendica/Photo/Lists.php | 2 +- src/Module/Api/Friendica/Photo/Update.php | 2 +- .../Api/Friendica/Photoalbum/Delete.php | 2 +- src/Module/Api/Friendica/Photoalbum/Index.php | 2 +- src/Module/Api/Friendica/Photoalbum/Show.php | 2 +- .../Api/Friendica/Photoalbum/Update.php | 2 +- src/Module/Api/Friendica/Profile/Show.php | 4 +-- src/Module/Api/GNUSocial/GNUSocial/Config.php | 2 +- .../Api/GNUSocial/GNUSocial/Version.php | 2 +- src/Module/Api/GNUSocial/Help/Test.php | 2 +- .../Api/GNUSocial/Statusnet/Conversation.php | 2 +- src/Module/Api/Mastodon/Accounts.php | 2 +- src/Module/Api/Mastodon/Accounts/Block.php | 2 +- .../Api/Mastodon/Accounts/FeaturedTags.php | 2 +- src/Module/Api/Mastodon/Accounts/Follow.php | 2 +- .../Api/Mastodon/Accounts/Followers.php | 26 +++++++++---------- .../Api/Mastodon/Accounts/Following.php | 16 ++++++------ .../Api/Mastodon/Accounts/IdentityProofs.php | 2 +- src/Module/Api/Mastodon/Accounts/Lists.php | 2 +- src/Module/Api/Mastodon/Accounts/Mute.php | 2 +- src/Module/Api/Mastodon/Accounts/Note.php | 2 +- .../Api/Mastodon/Accounts/Relationships.php | 2 +- src/Module/Api/Mastodon/Accounts/Search.php | 2 +- src/Module/Api/Mastodon/Accounts/Statuses.php | 2 +- src/Module/Api/Mastodon/Accounts/Unblock.php | 2 +- src/Module/Api/Mastodon/Accounts/Unfollow.php | 2 +- src/Module/Api/Mastodon/Accounts/Unmute.php | 2 +- .../Mastodon/Accounts/UpdateCredentials.php | 2 +- .../Mastodon/Accounts/VerifyCredentials.php | 2 +- src/Module/Api/Mastodon/Announcements.php | 2 +- src/Module/Api/Mastodon/Apps.php | 4 +-- .../Api/Mastodon/Apps/VerifyCredentials.php | 2 +- src/Module/Api/Mastodon/Blocks.php | 2 +- src/Module/Api/Mastodon/Bookmarks.php | 2 +- src/Module/Api/Mastodon/Conversations.php | 2 +- .../Api/Mastodon/Conversations/Read.php | 2 +- src/Module/Api/Mastodon/CustomEmojis.php | 2 +- src/Module/Api/Mastodon/Directory.php | 2 +- src/Module/Api/Mastodon/Endorsements.php | 2 +- src/Module/Api/Mastodon/Favourited.php | 2 +- src/Module/Api/Mastodon/Filters.php | 2 +- src/Module/Api/Mastodon/FollowRequests.php | 2 +- src/Module/Api/Mastodon/FollowedTags.php | 2 +- src/Module/Api/Mastodon/Instance.php | 2 +- src/Module/Api/Mastodon/Instance/Peers.php | 2 +- src/Module/Api/Mastodon/Instance/Rules.php | 2 +- src/Module/Api/Mastodon/Lists.php | 2 +- src/Module/Api/Mastodon/Lists/Accounts.php | 4 +-- src/Module/Api/Mastodon/Markers.php | 2 +- src/Module/Api/Mastodon/Media.php | 4 +-- src/Module/Api/Mastodon/Mutes.php | 2 +- src/Module/Api/Mastodon/Notifications.php | 2 +- .../Api/Mastodon/Notifications/Clear.php | 2 +- .../Api/Mastodon/Notifications/Dismiss.php | 2 +- src/Module/Api/Mastodon/Polls.php | 2 +- src/Module/Api/Mastodon/Preferences.php | 2 +- src/Module/Api/Mastodon/Proofs.php | 2 +- src/Module/Api/Mastodon/PushSubscription.php | 2 +- src/Module/Api/Mastodon/Reports.php | 2 +- src/Module/Api/Mastodon/ScheduledStatuses.php | 2 +- src/Module/Api/Mastodon/Search.php | 2 +- src/Module/Api/Mastodon/Statuses.php | 2 +- src/Module/Api/Mastodon/Statuses/Bookmark.php | 2 +- src/Module/Api/Mastodon/Statuses/Card.php | 2 +- src/Module/Api/Mastodon/Statuses/Context.php | 2 +- .../Api/Mastodon/Statuses/Favourite.php | 2 +- .../Api/Mastodon/Statuses/FavouritedBy.php | 2 +- src/Module/Api/Mastodon/Statuses/Mute.php | 2 +- src/Module/Api/Mastodon/Statuses/Pin.php | 2 +- src/Module/Api/Mastodon/Statuses/Reblog.php | 2 +- .../Api/Mastodon/Statuses/RebloggedBy.php | 2 +- src/Module/Api/Mastodon/Statuses/Source.php | 2 +- .../Api/Mastodon/Statuses/Unbookmark.php | 2 +- .../Api/Mastodon/Statuses/Unfavourite.php | 2 +- src/Module/Api/Mastodon/Statuses/Unmute.php | 2 +- src/Module/Api/Mastodon/Statuses/Unpin.php | 2 +- src/Module/Api/Mastodon/Statuses/Unreblog.php | 4 +-- src/Module/Api/Mastodon/Suggestions.php | 2 +- src/Module/Api/Mastodon/Tags.php | 2 +- src/Module/Api/Mastodon/Tags/Follow.php | 2 +- src/Module/Api/Mastodon/Tags/Unfollow.php | 2 +- src/Module/Api/Mastodon/Timelines/Direct.php | 2 +- src/Module/Api/Mastodon/Timelines/Home.php | 2 +- .../Api/Mastodon/Timelines/ListTimeline.php | 2 +- .../Api/Mastodon/Timelines/PublicTimeline.php | 2 +- src/Module/Api/Mastodon/Timelines/Tag.php | 4 +-- src/Module/Api/Mastodon/Trends/Links.php | 2 +- src/Module/Api/Mastodon/Trends/Statuses.php | 2 +- src/Module/Api/Mastodon/Trends/Tags.php | 2 +- src/Module/Api/Mastodon/Unimplemented.php | 2 +- .../Api/Twitter/Account/RateLimitStatus.php | 2 +- .../Api/Twitter/Account/UpdateProfile.php | 2 +- .../Twitter/Account/UpdateProfileImage.php | 2 +- .../Api/Twitter/Account/VerifyCredentials.php | 2 +- src/Module/Api/Twitter/Blocks/Ids.php | 2 +- src/Module/Api/Twitter/Blocks/Lists.php | 2 +- src/Module/Api/Twitter/ContactEndpoint.php | 2 +- src/Module/Api/Twitter/DirectMessages/All.php | 2 +- .../Twitter/DirectMessages/Conversation.php | 2 +- .../Api/Twitter/DirectMessages/Destroy.php | 2 +- .../Api/Twitter/DirectMessages/Inbox.php | 2 +- .../Api/Twitter/DirectMessages/NewDM.php | 2 +- .../Api/Twitter/DirectMessages/Sent.php | 2 +- .../Api/Twitter/DirectMessagesEndpoint.php | 2 +- src/Module/Api/Twitter/Favorites.php | 2 +- src/Module/Api/Twitter/Favorites/Create.php | 2 +- src/Module/Api/Twitter/Favorites/Destroy.php | 2 +- src/Module/Api/Twitter/Followers/Ids.php | 14 +++++----- src/Module/Api/Twitter/Followers/Lists.php | 16 ++++++------ src/Module/Api/Twitter/Friends/Ids.php | 14 +++++----- src/Module/Api/Twitter/Friends/Lists.php | 16 ++++++------ .../Api/Twitter/Friendships/Destroy.php | 2 +- .../Api/Twitter/Friendships/Incoming.php | 4 +-- src/Module/Api/Twitter/Friendships/Show.php | 2 +- src/Module/Api/Twitter/Lists/Create.php | 2 +- src/Module/Api/Twitter/Lists/Destroy.php | 2 +- src/Module/Api/Twitter/Lists/Lists.php | 2 +- src/Module/Api/Twitter/Lists/Ownership.php | 2 +- src/Module/Api/Twitter/Lists/Statuses.php | 2 +- src/Module/Api/Twitter/Lists/Update.php | 2 +- .../Api/Twitter/Media/Metadata/Create.php | 2 +- src/Module/Api/Twitter/Media/Upload.php | 2 +- src/Module/Api/Twitter/SavedSearches.php | 2 +- src/Module/Api/Twitter/Search/Tweets.php | 2 +- src/Module/Api/Twitter/Statuses/Destroy.php | 2 +- .../Api/Twitter/Statuses/HomeTimeline.php | 2 +- src/Module/Api/Twitter/Statuses/Mentions.php | 2 +- .../Statuses/NetworkPublicTimeline.php | 2 +- .../Api/Twitter/Statuses/PublicTimeline.php | 2 +- src/Module/Api/Twitter/Statuses/Retweet.php | 2 +- src/Module/Api/Twitter/Statuses/Show.php | 2 +- src/Module/Api/Twitter/Statuses/Update.php | 2 +- .../Api/Twitter/Statuses/UserTimeline.php | 2 +- src/Module/Api/Twitter/Users/Lookup.php | 2 +- src/Module/Api/Twitter/Users/Search.php | 2 +- src/Module/Api/Twitter/Users/Show.php | 2 +- src/Module/Apps.php | 2 +- src/Module/Attach.php | 2 +- src/Module/BaseAdmin.php | 2 +- src/Module/BaseApi.php | 6 ++--- src/Module/BaseModeration.php | 2 +- src/Module/BaseNotifications.php | 2 +- src/Module/BaseProfile.php | 2 +- src/Module/BaseSearch.php | 2 +- src/Module/BaseSettings.php | 2 +- src/Module/Blocklist/Domain/Download.php | 2 +- src/Module/Bookmarklet.php | 2 +- src/Module/Calendar/Event/API.php | 2 +- src/Module/Calendar/Event/Form.php | 2 +- src/Module/Calendar/Event/Get.php | 2 +- src/Module/Calendar/Event/Show.php | 2 +- src/Module/Calendar/Export.php | 2 +- src/Module/Calendar/Show.php | 2 +- src/Module/Contact.php | 2 +- src/Module/Contact/Advanced.php | 2 +- src/Module/Contact/Contacts.php | 2 +- src/Module/Contact/Conversations.php | 2 +- src/Module/Contact/Follow.php | 2 +- src/Module/Contact/Hovercard.php | 2 +- src/Module/Contact/MatchInterests.php | 2 +- src/Module/Contact/Media.php | 2 +- src/Module/Contact/Posts.php | 2 +- src/Module/Contact/Profile.php | 2 +- src/Module/Contact/Redir.php | 2 +- src/Module/Contact/Revoke.php | 4 +-- src/Module/Contact/Suggestions.php | 2 +- src/Module/Contact/Unfollow.php | 2 +- src/Module/Conversation/Community.php | 2 +- src/Module/Conversation/Network.php | 4 +-- src/Module/Credits.php | 2 +- src/Module/DFRN/Notify.php | 2 +- src/Module/DFRN/Poll.php | 2 +- src/Module/Debug/ActivityPubConversion.php | 2 +- src/Module/Debug/Babel.php | 2 +- src/Module/Debug/Feed.php | 2 +- src/Module/Debug/ItemBody.php | 2 +- src/Module/Debug/Localtime.php | 2 +- src/Module/Debug/Probe.php | 2 +- src/Module/Debug/WebFinger.php | 2 +- src/Module/Delegation.php | 2 +- src/Module/Diaspora/Fetch.php | 2 +- src/Module/Diaspora/Receive.php | 2 +- src/Module/Directory.php | 2 +- src/Module/Feed.php | 2 +- src/Module/Filer/RemoveTag.php | 2 +- src/Module/Filer/SaveTag.php | 2 +- src/Module/FollowConfirm.php | 2 +- src/Module/FriendSuggest.php | 2 +- src/Module/Friendica.php | 2 +- src/Module/Group.php | 2 +- src/Module/HCard.php | 2 +- src/Module/HTTPException/MethodNotAllowed.php | 2 +- src/Module/HTTPException/PageNotFound.php | 2 +- src/Module/Hashtag.php | 2 +- src/Module/Help.php | 2 +- src/Module/Home.php | 2 +- src/Module/Install.php | 4 +-- src/Module/Invite.php | 2 +- src/Module/Item/Activity.php | 2 +- src/Module/Item/Compose.php | 2 +- src/Module/Item/Display.php | 2 +- src/Module/Item/Feed.php | 2 +- src/Module/Item/Follow.php | 2 +- src/Module/Item/Ignore.php | 2 +- src/Module/Item/Pin.php | 2 +- src/Module/Item/Star.php | 4 +-- src/Module/Magic.php | 2 +- src/Module/Maintenance.php | 2 +- src/Module/Manifest.php | 2 +- src/Module/Media/Attachment/Browser.php | 2 +- src/Module/Media/Attachment/Upload.php | 2 +- src/Module/Media/Photo/Browser.php | 2 +- src/Module/Media/Photo/Upload.php | 2 +- src/Module/Moderation/BaseUsers.php | 2 +- src/Module/Moderation/Blocklist/Contact.php | 2 +- .../Moderation/Blocklist/Server/Add.php | 2 +- .../Moderation/Blocklist/Server/Import.php | 2 +- .../Moderation/Blocklist/Server/Index.php | 2 +- src/Module/Moderation/Item/Delete.php | 2 +- src/Module/Moderation/Item/Source.php | 2 +- src/Module/Moderation/Summary.php | 2 +- src/Module/Moderation/Users/Active.php | 2 +- src/Module/Moderation/Users/Blocked.php | 2 +- src/Module/Moderation/Users/Create.php | 2 +- src/Module/Moderation/Users/Deleted.php | 2 +- src/Module/Moderation/Users/Index.php | 2 +- src/Module/Moderation/Users/Pending.php | 2 +- src/Module/NoScrape.php | 2 +- src/Module/NodeInfo110.php | 2 +- src/Module/NodeInfo120.php | 2 +- src/Module/NodeInfo210.php | 2 +- src/Module/Notifications/Introductions.php | 6 ++--- src/Module/Notifications/Notification.php | 2 +- src/Module/Notifications/Notifications.php | 2 +- src/Module/Notifications/Ping.php | 2 +- src/Module/OAuth/Acknowledge.php | 2 +- src/Module/OAuth/Authorize.php | 2 +- src/Module/OAuth/Revoke.php | 2 +- src/Module/OAuth/Token.php | 2 +- src/Module/OStatus/PubSub.php | 2 +- src/Module/OStatus/PubSubHubBub.php | 2 +- src/Module/OStatus/Repair.php | 2 +- src/Module/OStatus/Salmon.php | 2 +- src/Module/OStatus/Subscribe.php | 2 +- src/Module/Oembed.php | 2 +- src/Module/OpenSearch.php | 2 +- src/Module/Owa.php | 2 +- src/Module/ParseUrl.php | 2 +- src/Module/PermissionTooltip.php | 2 +- src/Module/Photo.php | 2 +- src/Module/Post/Edit.php | 2 +- src/Module/Post/Share.php | 2 +- src/Module/Post/Tag/Add.php | 2 +- src/Module/Post/Tag/Remove.php | 2 +- src/Module/Profile/Common.php | 2 +- src/Module/Profile/Contacts.php | 2 +- src/Module/Profile/Index.php | 2 +- src/Module/Profile/Media.php | 2 +- src/Module/Profile/Photos.php | 2 +- src/Module/Profile/Profile.php | 2 +- src/Module/Profile/RemoteFollow.php | 4 +-- src/Module/Profile/Restricted.php | 2 +- src/Module/Profile/Schedule.php | 2 +- src/Module/Profile/Status.php | 2 +- src/Module/Profile/UnkMail.php | 2 +- src/Module/Proxy.php | 2 +- src/Module/PublicRSAKey.php | 2 +- src/Module/RandomProfile.php | 2 +- src/Module/ReallySimpleDiscovery.php | 2 +- src/Module/Register.php | 2 +- src/Module/Response.php | 2 +- src/Module/RobotsTxt.php | 2 +- src/Module/Search/Acl.php | 2 +- src/Module/Search/Directory.php | 2 +- src/Module/Search/Filed.php | 2 +- src/Module/Search/Index.php | 2 +- src/Module/Search/Saved.php | 2 +- src/Module/Search/Tags.php | 2 +- src/Module/Security/Login.php | 2 +- src/Module/Security/Logout.php | 2 +- src/Module/Security/OpenID.php | 2 +- src/Module/Security/PasswordTooLong.php | 2 +- src/Module/Security/TwoFactor/Recovery.php | 2 +- src/Module/Security/TwoFactor/SignOut.php | 2 +- src/Module/Security/TwoFactor/Trust.php | 2 +- src/Module/Security/TwoFactor/Verify.php | 2 +- src/Module/Settings/Account.php | 2 +- src/Module/Settings/Addons.php | 2 +- src/Module/Settings/Connectors.php | 2 +- src/Module/Settings/Delegation.php | 2 +- src/Module/Settings/Display.php | 2 +- src/Module/Settings/Features.php | 2 +- src/Module/Settings/OAuth.php | 2 +- src/Module/Settings/Profile/Index.php | 2 +- src/Module/Settings/Profile/Photo/Crop.php | 2 +- src/Module/Settings/Profile/Photo/Index.php | 2 +- src/Module/Settings/RemoveMe.php | 2 +- src/Module/Settings/TwoFactor/AppSpecific.php | 2 +- src/Module/Settings/TwoFactor/Index.php | 2 +- src/Module/Settings/TwoFactor/Recovery.php | 2 +- src/Module/Settings/TwoFactor/Trusted.php | 2 +- src/Module/Settings/TwoFactor/Verify.php | 2 +- src/Module/Settings/UserExport.php | 2 +- src/Module/Smilies.php | 2 +- src/Module/Special/HTTPException.php | 2 +- src/Module/Special/Options.php | 2 +- src/Module/Statistics.php | 2 +- src/Module/Theme.php | 2 +- src/Module/ThemeDetails.php | 2 +- src/Module/ToggleMobile.php | 2 +- src/Module/Tos.php | 2 +- src/Module/Update/Community.php | 2 +- src/Module/Update/Display.php | 2 +- src/Module/Update/Network.php | 2 +- src/Module/Update/Profile.php | 2 +- src/Module/User/Import.php | 2 +- src/Module/User/PortableContacts.php | 2 +- src/Module/Welcome.php | 2 +- src/Module/WellKnown/HostMeta.php | 6 ++--- src/Module/WellKnown/NodeInfo.php | 2 +- src/Module/WellKnown/SecurityTxt.php | 2 +- src/Module/WellKnown/XSocialRelay.php | 2 +- src/Module/Xrd.php | 2 +- .../Collection/FormattedNotifies.php | 2 +- .../Collection/Notifications.php | 2 +- .../Notifications/Collection/Notifies.php | 2 +- .../Notifications/Entity/Notification.php | 2 +- .../Notifications/Entity/Notify.php | 2 +- .../Exception/NoMessageException.php | 2 +- ...tificationCreationInterceptedException.php | 2 +- .../UnexpectedNotificationTypeException.php | 2 +- .../Factory/FormattedNavNotification.php | 2 +- .../Notifications/Factory/FormattedNotify.php | 2 +- .../Notifications/Factory/Introduction.php | 2 +- .../Notifications/Factory/Notification.php | 4 +-- .../Notifications/Factory/Notify.php | 2 +- .../Notifications/Repository/Notification.php | 2 +- .../Notifications/Repository/Notify.php | 2 +- .../ValueObject/FormattedNavNotification.php | 2 +- .../ValueObject/FormattedNotify.php | 2 +- .../ValueObject/Introduction.php | 2 +- src/Navigation/SystemMessages.php | 2 +- .../Capability/ICanHandleHttpResponses.php | 2 +- .../Capability/ICanSendHttpRequests.php | 2 +- src/Network/HTTPClient/Client/HttpClient.php | 2 +- .../HTTPClient/Client/HttpClientAccept.php | 2 +- .../HTTPClient/Client/HttpClientOptions.php | 2 +- src/Network/HTTPClient/Factory/HttpClient.php | 2 +- .../HTTPClient/Response/CurlResult.php | 2 +- .../HTTPClient/Response/GuzzleResponse.php | 2 +- src/Network/HTTPException.php | 2 +- .../HTTPException/AcceptedException.php | 2 +- .../HTTPException/BadGatewayException.php | 2 +- .../HTTPException/BadRequestException.php | 2 +- .../HTTPException/ConflictException.php | 2 +- .../ExpectationFailedException.php | 2 +- .../HTTPException/ForbiddenException.php | 2 +- src/Network/HTTPException/FoundException.php | 2 +- .../HTTPException/GatewayTimeoutException.php | 2 +- src/Network/HTTPException/GoneException.php | 2 +- .../HTTPException/ImATeapotException.php | 2 +- .../InternalServerErrorException.php | 2 +- .../HTTPException/LenghtRequiredException.php | 2 +- .../MethodNotAllowedException.php | 2 +- .../MovedPermanentlyException.php | 2 +- .../HTTPException/NoContentException.php | 2 +- .../HTTPException/NonAcceptableException.php | 2 +- .../HTTPException/NotFoundException.php | 2 +- .../HTTPException/NotImplementedException.php | 2 +- .../HTTPException/NotModifiedException.php | 2 +- src/Network/HTTPException/OKException.php | 2 +- .../PreconditionFailedException.php | 2 +- .../ServiceUnavailableException.php | 2 +- .../TemporaryRedirectException.php | 2 +- .../TooManyRequestsException.php | 2 +- .../HTTPException/UnauthorizedException.php | 2 +- .../UnprocessableEntityException.php | 2 +- .../UnsupportedMediaTypeException.php | 2 +- src/Network/Probe.php | 6 ++--- src/Object/Api/Friendica/Group.php | 2 +- src/Object/Api/Friendica/Notification.php | 2 +- src/Object/Api/Mastodon/Account.php | 2 +- src/Object/Api/Mastodon/Activity.php | 4 +-- src/Object/Api/Mastodon/Application.php | 2 +- src/Object/Api/Mastodon/Attachment.php | 2 +- src/Object/Api/Mastodon/Card.php | 2 +- src/Object/Api/Mastodon/Conversation.php | 2 +- src/Object/Api/Mastodon/Emoji.php | 2 +- src/Object/Api/Mastodon/Error.php | 2 +- src/Object/Api/Mastodon/Field.php | 2 +- src/Object/Api/Mastodon/FollowRequest.php | 2 +- src/Object/Api/Mastodon/Instance.php | 2 +- src/Object/Api/Mastodon/ListEntity.php | 2 +- src/Object/Api/Mastodon/Mention.php | 2 +- src/Object/Api/Mastodon/Notification.php | 2 +- src/Object/Api/Mastodon/Poll.php | 2 +- src/Object/Api/Mastodon/Preferences.php | 2 +- src/Object/Api/Mastodon/Relationship.php | 2 +- src/Object/Api/Mastodon/ScheduledStatus.php | 2 +- src/Object/Api/Mastodon/Stats.php | 2 +- src/Object/Api/Mastodon/Status.php | 2 +- src/Object/Api/Mastodon/Status/Counts.php | 2 +- .../Api/Mastodon/Status/UserAttributes.php | 2 +- src/Object/Api/Mastodon/StatusSource.php | 2 +- src/Object/Api/Mastodon/Subscription.php | 2 +- src/Object/Api/Mastodon/Tag.php | 2 +- src/Object/Api/Mastodon/Token.php | 2 +- src/Object/Api/Twitter/Attachment.php | 2 +- src/Object/Api/Twitter/DirectMessage.php | 2 +- src/Object/Api/Twitter/Hashtag.php | 2 +- src/Object/Api/Twitter/Media.php | 2 +- src/Object/Api/Twitter/Mention.php | 2 +- src/Object/Api/Twitter/SavedSearch.php | 2 +- src/Object/Api/Twitter/Status.php | 2 +- src/Object/Api/Twitter/Url.php | 2 +- src/Object/Api/Twitter/User.php | 2 +- src/Object/EMail/IEmail.php | 2 +- src/Object/EMail/ItemCCEMail.php | 2 +- src/Object/Email.php | 2 +- src/Object/Image.php | 2 +- src/Object/Log/ParsedLogLine.php | 2 +- src/Object/OEmbed.php | 2 +- src/Object/Post.php | 2 +- src/Object/Search/ContactResult.php | 2 +- src/Object/Search/IResult.php | 2 +- src/Object/Search/ResultList.php | 2 +- src/Object/Thread.php | 2 +- .../ProfileField/Collection/ProfileFields.php | 2 +- .../ProfileField/Entity/ProfileField.php | 2 +- .../ProfileFieldNotFoundException.php | 2 +- .../ProfileFieldPersistenceException.php | 2 +- .../UnexpectedPermissionSetException.php | 2 +- .../ProfileField/Factory/ProfileField.php | 2 +- .../ProfileField/Repository/ProfileField.php | 2 +- src/Protocol/Activity.php | 4 +-- src/Protocol/Activity/ObjectType.php | 2 +- src/Protocol/ActivityNamespace.php | 4 +-- src/Protocol/ActivityPub.php | 2 +- src/Protocol/ActivityPub/Delivery.php | 2 +- src/Protocol/ActivityPub/Fetch.php | 2 +- src/Protocol/ActivityPub/Processor.php | 2 +- src/Protocol/ActivityPub/Queue.php | 2 +- src/Protocol/ActivityPub/Receiver.php | 6 ++--- src/Protocol/ActivityPub/Transmitter.php | 2 +- src/Protocol/DFRN.php | 2 +- src/Protocol/Delivery.php | 2 +- src/Protocol/Diaspora.php | 2 +- .../Diaspora/Entity/DiasporaContact.php | 2 +- .../Diaspora/Factory/DiasporaContact.php | 2 +- .../Diaspora/Repository/DiasporaContact.php | 2 +- src/Protocol/Email.php | 2 +- src/Protocol/Feed.php | 2 +- src/Protocol/OStatus.php | 4 +-- src/Protocol/Relay.php | 6 ++--- src/Protocol/Salmon.php | 2 +- src/Protocol/Salmon/Format/Magic.php | 2 +- src/Protocol/WebFingerUri.php | 2 +- src/Render/FriendicaSmarty.php | 4 +-- src/Render/FriendicaSmartyEngine.php | 2 +- src/Render/TemplateEngine.php | 2 +- src/Security/Authentication.php | 2 +- src/Security/BasicAuth.php | 2 +- src/Security/ExAuth.php | 2 +- src/Security/OAuth.php | 4 +-- src/Security/OAuth1/OAuthConsumer.php | 2 +- src/Security/OAuth1/OAuthDataStore.php | 2 +- src/Security/OAuth1/OAuthException.php | 2 +- src/Security/OAuth1/OAuthRequest.php | 2 +- src/Security/OAuth1/OAuthToken.php | 2 +- src/Security/OAuth1/OAuthUtil.php | 2 +- .../OAuth1/Signature/OAuthSignatureMethod.php | 2 +- .../OAuthSignatureMethod_HMAC_SHA1.php | 2 +- .../OAuthSignatureMethod_PLAINTEXT.php | 2 +- .../OAuthSignatureMethod_RSA_SHA1.php | 2 +- .../Collection/PermissionSets.php | 2 +- .../PermissionSet/Entity/PermissionSet.php | 2 +- .../PermissionSetNotFoundException.php | 2 +- .../PermissionSetPersistenceException.php | 2 +- .../PermissionSet/Factory/PermissionSet.php | 2 +- .../Repository/PermissionSet.php | 2 +- src/Security/Security.php | 4 +-- .../TwoFactor/Collection/TrustedBrowsers.php | 2 +- .../TrustedBrowserNotFoundException.php | 2 +- .../TrustedBrowserPersistenceException.php | 2 +- .../TwoFactor/Factory/TrustedBrowser.php | 2 +- .../TwoFactor/Model/AppSpecificPassword.php | 2 +- src/Security/TwoFactor/Model/RecoveryCode.php | 2 +- .../TwoFactor/Model/TrustedBrowser.php | 2 +- .../TwoFactor/Repository/TrustedBrowser.php | 2 +- src/Util/ACLFormatter.php | 2 +- src/Util/Arrays.php | 2 +- src/Util/BasePath.php | 2 +- src/Util/Clock/FrozenClock.php | 2 +- src/Util/Clock/SystemClock.php | 2 +- src/Util/Crypto.php | 2 +- src/Util/DateTimeFormat.php | 2 +- src/Util/EMailer/MailBuilder.php | 2 +- src/Util/EMailer/NotifyMailBuilder.php | 2 +- src/Util/EMailer/SystemMailBuilder.php | 2 +- src/Util/Emailer.php | 2 +- src/Util/FileSystem.php | 2 +- src/Util/HTTPHeaders.php | 2 +- src/Util/HTTPInputData.php | 2 +- src/Util/HTTPSignature.php | 2 +- src/Util/Images.php | 2 +- src/Util/JsonLD.php | 2 +- src/Util/LDSignature.php | 2 +- src/Util/Map.php | 2 +- src/Util/Mimetype.php | 22 ++++++++-------- src/Util/Network.php | 8 +++--- src/Util/ParseUrl.php | 2 +- src/Util/PidFile.php | 2 +- src/Util/Profiler.php | 2 +- src/Util/Proxy.php | 2 +- src/Util/ReversedFileReader.php | 2 +- src/Util/Router/FriendicaGroupCountBased.php | 2 +- src/Util/Strings.php | 2 +- src/Util/Temporal.php | 2 +- src/Util/Writer/DbaDefinitionSqlWriter.php | 2 +- src/Util/Writer/DocWriter.php | 2 +- src/Util/Writer/ViewDefinitionSqlWriter.php | 2 +- src/Util/XML.php | 2 +- src/Worker/APDelivery.php | 2 +- src/Worker/AddContact.php | 2 +- src/Worker/BulkDelivery.php | 2 +- src/Worker/CheckDeletedContacts.php | 2 +- src/Worker/CheckRelMeProfileLink.php | 2 +- src/Worker/CheckVersion.php | 2 +- src/Worker/ClearCache.php | 2 +- src/Worker/Contact/Remove.php | 2 +- src/Worker/Contact/RemoveContent.php | 2 +- src/Worker/Contact/RevokeFollow.php | 2 +- src/Worker/Contact/Unfollow.php | 2 +- src/Worker/ContactDiscovery.php | 2 +- src/Worker/ContactDiscoveryForUser.php | 2 +- src/Worker/Cron.php | 6 ++--- src/Worker/DBUpdate.php | 2 +- src/Worker/DelayedPublish.php | 2 +- src/Worker/Delivery.php | 2 +- src/Worker/Directory.php | 2 +- src/Worker/Expire.php | 2 +- src/Worker/ExpireActivities.php | 2 +- src/Worker/ExpireAndRemoveUsers.php | 2 +- src/Worker/ExpirePosts.php | 2 +- src/Worker/FetchFeaturedPosts.php | 2 +- src/Worker/FetchMissingActivity.php | 2 +- src/Worker/ForkHook.php | 2 +- src/Worker/MergeContact.php | 2 +- src/Worker/MoveStorage.php | 2 +- src/Worker/NodeInfo.php | 2 +- src/Worker/Notifier.php | 2 +- src/Worker/OnePoll.php | 2 +- src/Worker/OptimizeTables.php | 2 +- src/Worker/PollContacts.php | 2 +- src/Worker/PostUpdate.php | 2 +- src/Worker/ProcessQueue.php | 2 +- src/Worker/ProcessReplyByUri.php | 2 +- src/Worker/ProfileUpdate.php | 2 +- src/Worker/PubSubPublish.php | 2 +- src/Worker/PullDirectory.php | 2 +- src/Worker/PushSubscription.php | 2 +- src/Worker/RemoveUnusedAvatars.php | 4 +-- src/Worker/RemoveUnusedContacts.php | 4 +-- src/Worker/RemoveUnusedTags.php | 2 +- src/Worker/RemoveUser.php | 2 +- src/Worker/SearchDirectory.php | 2 +- src/Worker/SpoolPost.php | 2 +- src/Worker/UpdateAllSuggestions.php | 2 +- src/Worker/UpdateContact.php | 2 +- src/Worker/UpdateContactBirthdays.php | 2 +- src/Worker/UpdateContacts.php | 2 +- src/Worker/UpdateGServer.php | 2 +- src/Worker/UpdateGServers.php | 2 +- src/Worker/UpdatePhotoAlbums.php | 2 +- src/Worker/UpdateServerDirectories.php | 2 +- src/Worker/UpdateServerDirectory.php | 6 ++--- src/Worker/UpdateServerPeers.php | 2 +- src/Worker/UpdateSuggestions.php | 2 +- static/dbstructure.config.php | 2 +- static/dbview.config.php | 2 +- static/defaults.config.php | 2 +- static/dependencies.config.php | 2 +- static/env.config.php | 2 +- static/platforms.config.php | 2 +- static/routes.config.php | 2 +- static/settings.config.php | 2 +- tests/DatabaseTest.php | 2 +- tests/DatabaseTestTrait.php | 2 +- tests/DiceHttpMockHandlerTrait.php | 2 +- tests/FixtureTest.php | 2 +- tests/MockedTest.php | 2 +- tests/Util/AppDouble.php | 2 +- tests/Util/AuthTestConfig.php | 2 +- tests/Util/AuthenticationDouble.php | 2 +- tests/Util/CollectionDouble.php | 2 +- tests/Util/Database/ExtendedPDO.php | 2 +- tests/Util/Database/StaticDatabase.php | 2 +- tests/Util/EmailerSpy.php | 2 +- tests/Util/EntityDouble.php | 2 +- tests/Util/HTTPInputDataDouble.php | 2 +- tests/Util/HookMockTrait.php | 2 +- tests/Util/Intercept.php | 2 +- tests/Util/RendererMockTrait.php | 2 +- tests/Util/SampleMailBuilder.php | 2 +- tests/Util/SampleStorageBackend.php | 2 +- tests/Util/SampleStorageBackendInstance.php | 2 +- tests/Util/StaticCookie.php | 2 +- tests/Util/VFSTrait.php | 2 +- tests/bootstrap.php | 2 +- tests/datasets/api.fixture.php | 2 +- tests/datasets/storage/database.fixture.php | 2 +- tests/functional/DependencyCheckTest.php | 2 +- tests/src/App/ArgumentsTest.php | 2 +- tests/src/App/ModeTest.php | 2 +- tests/src/App/RequestTest.php | 2 +- tests/src/App/RouterTest.php | 2 +- tests/src/CollectionTest.php | 2 +- .../AutomaticInstallationConsoleTest.php | 2 +- tests/src/Console/ConfigConsoleTest.php | 2 +- tests/src/Console/ConsoleTest.php | 2 +- tests/src/Console/LockConsoleTest.php | 2 +- tests/src/Console/ServerBlockConsoleTest.php | 2 +- .../Factory/FriendSuggestTest.php | 2 +- .../Introduction/Factory/IntroductionTest.php | 2 +- tests/src/Content/ItemTest.php | 2 +- tests/src/Content/PageInfoMock.php | 2 +- tests/src/Content/PageInfoTest.php | 2 +- tests/src/Content/SmiliesTest.php | 2 +- tests/src/Content/Text/BBCode/VideoTest.php | 2 +- tests/src/Content/Text/BBCodeTest.php | 2 +- tests/src/Content/Text/HTMLTest.php | 2 +- tests/src/Content/Text/MarkdownTest.php | 2 +- tests/src/Core/ACLTest.php | 2 +- tests/src/Core/Cache/APCuCacheTest.php | 2 +- tests/src/Core/Cache/ArrayCacheTest.php | 2 +- tests/src/Core/Cache/CacheTest.php | 2 +- tests/src/Core/Cache/DatabaseCacheTest.php | 2 +- tests/src/Core/Cache/MemcacheCacheTest.php | 2 +- tests/src/Core/Cache/MemcachedCacheTest.php | 2 +- tests/src/Core/Cache/MemoryCacheTest.php | 2 +- tests/src/Core/Cache/RedisCacheTest.php | 2 +- tests/src/Core/Config/Cache/CacheTest.php | 2 +- .../Config/Cache/ConfigFileLoaderTest.php | 2 +- tests/src/Core/Config/ConfigTest.php | 2 +- tests/src/Core/Config/JitConfigTest.php | 2 +- tests/src/Core/Config/PreloadConfigTest.php | 2 +- tests/src/Core/InstallerTest.php | 2 +- .../KeyValueStorage/DBKeyValueStorageTest.php | 2 +- .../KeyValueStorage/KeyValueStorageTest.php | 2 +- tests/src/Core/L10nTest.php | 2 +- tests/src/Core/Lock/APCuCacheLockTest.php | 2 +- tests/src/Core/Lock/ArrayCacheLockTest.php | 2 +- .../src/Core/Lock/DatabaseLockDriverTest.php | 2 +- tests/src/Core/Lock/LockTest.php | 2 +- tests/src/Core/Lock/MemcacheCacheLockTest.php | 2 +- .../src/Core/Lock/MemcachedCacheLockTest.php | 2 +- tests/src/Core/Lock/RedisCacheLockTest.php | 2 +- tests/src/Core/Lock/SemaphoreLockTest.php | 2 +- tests/src/Core/Logger/AbstractLoggerTest.php | 2 +- tests/src/Core/Logger/LoggerDataTrait.php | 2 +- tests/src/Core/Logger/ProfilerLoggerTest.php | 2 +- tests/src/Core/Logger/StreamLoggerTest.php | 2 +- tests/src/Core/Logger/SyslogLoggerTest.php | 2 +- tests/src/Core/Logger/SyslogLoggerWrapper.php | 2 +- tests/src/Core/Logger/WorkerLoggerTest.php | 2 +- tests/src/Core/PConfig/Cache/CacheTest.php | 2 +- tests/src/Core/PConfig/JitPConfigTest.php | 2 +- tests/src/Core/PConfig/PConfigTest.php | 2 +- tests/src/Core/PConfig/PreloadPConfigTest.php | 2 +- tests/src/Core/Session/UserSessionTest.php | 2 +- .../src/Core/Storage/DatabaseStorageTest.php | 2 +- .../Storage/FilesystemStorageConfigTest.php | 2 +- .../Core/Storage/FilesystemStorageTest.php | 2 +- .../Storage/Repository/StorageManagerTest.php | 2 +- tests/src/Core/Storage/StorageConfigTest.php | 2 +- tests/src/Core/Storage/StorageTest.php | 2 +- tests/src/Core/SystemTest.php | 2 +- .../Core/Worker/Repository/ProcessTest.php | 2 +- tests/src/Database/DBATest.php | 2 +- tests/src/Database/DBStructureTest.php | 2 +- .../Factory/Api/Twitter/ActivitiesTest.php | 2 +- .../Factory/Api/Twitter/DirectMessageTest.php | 2 +- tests/src/Factory/Api/Twitter/StatusTest.php | 2 +- tests/src/Factory/Api/Twitter/UserTest.php | 2 +- tests/src/Model/FileTagTest.php | 2 +- tests/src/Model/Log/ParsedLogIteratorTest.php | 2 +- tests/src/Model/Post/MediaTest.php | 2 +- tests/src/Model/TagTest.php | 2 +- tests/src/Model/User/CookieTest.php | 2 +- tests/src/Model/UserTest.php | 2 +- tests/src/Moderation/Factory/ReportTest.php | 2 +- tests/src/Module/Api/ApiResponseTest.php | 2 +- tests/src/Module/Api/ApiTest.php | 2 +- .../Friendica/DirectMessages/SearchTest.php | 2 +- .../Module/Api/Friendica/NotificationTest.php | 2 +- .../Module/Api/Friendica/Photo/DeleteTest.php | 2 +- .../Api/Friendica/Photoalbum/DeleteTest.php | 2 +- .../Api/Friendica/Photoalbum/UpdateTest.php | 2 +- .../Api/GnuSocial/GnuSocial/ConfigTest.php | 2 +- .../Api/GnuSocial/GnuSocial/VersionTest.php | 2 +- .../Module/Api/GnuSocial/Help/TestTest.php | 2 +- .../Api/Mastodon/Accounts/StatusesTest.php | 2 +- .../Accounts/VerifyCredentialsTest.php | 2 +- .../Module/Api/Mastodon/ConversationsTest.php | 2 +- .../Api/Mastodon/PushSubscriptionTest.php | 2 +- tests/src/Module/Api/Mastodon/SearchTest.php | 2 +- .../Api/Mastodon/Timelines/HomeTest.php | 2 +- .../Mastodon/Timelines/PublicTimelineTest.php | 2 +- .../Twitter/Account/RateLimitStatusTest.php | 2 +- .../Api/Twitter/Account/UpdateProfileTest.php | 2 +- .../Module/Api/Twitter/Blocks/ListsTest.php | 2 +- .../Api/Twitter/ContactEndpointMock.php | 2 +- .../Api/Twitter/ContactEndpointTest.php | 2 +- .../Api/Twitter/DirectMessages/AllTest.php | 2 +- .../DirectMessages/ConversationTest.php | 2 +- .../Twitter/DirectMessages/DestroyTest.php | 2 +- .../Api/Twitter/DirectMessages/InboxTest.php | 2 +- .../Api/Twitter/DirectMessages/NewDMTest.php | 2 +- .../Api/Twitter/DirectMessages/SentTest.php | 2 +- .../Api/Twitter/Favorites/CreateTest.php | 2 +- .../Api/Twitter/Favorites/DestroyTest.php | 2 +- .../src/Module/Api/Twitter/FavoritesTest.php | 2 +- .../Api/Twitter/Followers/ListsTest.php | 2 +- .../Module/Api/Twitter/Friends/ListsTest.php | 2 +- .../Api/Twitter/Friendships/IncomingTest.php | 2 +- .../Module/Api/Twitter/Lists/StatusesTest.php | 2 +- .../Module/Api/Twitter/Media/UploadTest.php | 2 +- .../Module/Api/Twitter/SavedSearchesTest.php | 2 +- .../Api/Twitter/Statuses/DestroyTest.php | 2 +- .../Api/Twitter/Statuses/MentionsTest.php | 2 +- .../Statuses/NetworkPublicTimelineTest.php | 2 +- .../Api/Twitter/Statuses/RetweetTest.php | 2 +- .../Module/Api/Twitter/Statuses/ShowTest.php | 2 +- .../Api/Twitter/Statuses/UpdateTest.php | 2 +- .../Api/Twitter/Statuses/UserTimelineTest.php | 2 +- .../Module/Api/Twitter/Users/LookupTest.php | 2 +- .../Module/Api/Twitter/Users/SearchTest.php | 2 +- .../src/Module/Api/Twitter/Users/ShowTest.php | 2 +- tests/src/Module/BaseApiTest.php | 2 +- tests/src/Module/NodeInfoTest.php | 2 +- tests/src/Module/Special/OptionsTest.php | 2 +- .../HTTPClient/Client/HTTPClientTest.php | 2 +- .../HTTPClient/Response/CurlResultTest.php | 2 +- tests/src/Network/ProbeTest.php | 2 +- tests/src/Object/Log/ParsedLogLineTest.php | 2 +- .../ProfileField/Entity/ProfileFieldTest.php | 2 +- .../Repository/ProfileFieldTest.php | 2 +- .../Protocol/ActivityPub/ProcessorMock.php | 2 +- .../Protocol/ActivityPub/ProcessorTest.php | 2 +- tests/src/Protocol/ActivityTest.php | 2 +- tests/src/Protocol/SalmonTest.php | 2 +- tests/src/Protocol/WebFingerUriTest.php | 2 +- tests/src/Security/BasicAuthTest.php | 2 +- .../Entity/PermissionSetTest.php | 2 +- .../Factory/PermissionSetTest.php | 2 +- .../Repository/PermissionSetTest.php | 2 +- .../TwoFactor/Factory/TrustedBrowserTest.php | 2 +- .../TwoFactor/Model/TrustedBrowserTest.php | 2 +- tests/src/Util/ACLFormaterTest.php | 2 +- tests/src/Util/ArraysTest.php | 2 +- tests/src/Util/BasePathTest.php | 4 +-- tests/src/Util/BaseURLTest.php | 2 +- tests/src/Util/CryptoTest.php | 2 +- tests/src/Util/DateTimeFormatTest.php | 2 +- tests/src/Util/EMailerTest.php | 2 +- tests/src/Util/Emailer/MailBuilderTest.php | 2 +- .../Util/Emailer/SystemMailBuilderTest.php | 2 +- tests/src/Util/HTTPInputDataTest.php | 2 +- tests/src/Util/HTTPSignatureTest.php | 2 +- tests/src/Util/ImagesTest.php | 2 +- tests/src/Util/JsonLDTest.php | 4 +-- tests/src/Util/ProfilerTest.php | 2 +- .../Router/FriendicaGroupCountBasedTest.php | 2 +- tests/src/Util/StringsTest.php | 2 +- tests/src/Util/TemporalTest.php | 2 +- tests/src/Util/XmlTest.php | 2 +- update.php | 2 +- view/php/none.php | 4 +-- view/theme/duepuntozero/config.php | 2 +- view/theme/duepuntozero/style.php | 2 +- view/theme/duepuntozero/theme.php | 2 +- view/theme/frio/config.php | 2 +- view/theme/frio/php/Image.php | 2 +- view/theme/frio/php/default.php | 2 +- view/theme/frio/php/frio_boot.php | 2 +- view/theme/frio/php/scheme.php | 2 +- view/theme/frio/php/standard.php | 2 +- view/theme/frio/style.php | 2 +- view/theme/frio/theme.php | 2 +- view/theme/quattro/config.php | 2 +- view/theme/quattro/style.php | 2 +- view/theme/vier/config.php | 2 +- view/theme/vier/style.php | 2 +- view/theme/vier/theme.php | 2 +- 1139 files changed, 1261 insertions(+), 1261 deletions(-) diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php index 14ed7b0b2..ecff7218d 100755 --- a/bin/auth_ejabberd.php +++ b/bin/auth_ejabberd.php @@ -1,7 +1,7 @@ #!/usr/bin/env php Contact::TYPE_COMMUNITY, 'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB], - 'uid' => $uid, + 'uid' => $uid, 'blocked' => false, 'pending' => false, - 'archive' => false, + 'archive' => false, ]; $condition = DBA::mergeConditions($condition, ["`platform` != ?", 'peertube']); diff --git a/src/Content/Item.php b/src/Content/Item.php index 4fb1f85d6..2cccf722a 100644 --- a/src/Content/Item.php +++ b/src/Content/Item.php @@ -1,6 +1,6 @@ t('The detection of TLS to secure the communication between the browser and the new Friendica server failed.'); $help .= ' ' . DI::l10n()->t('It is highly encouraged to use Friendica only over a secure connection as sensitive information like passwords will be transmitted.'); diff --git a/src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php b/src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php index 64b317bf1..c9d215c49 100644 --- a/src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php +++ b/src/Core/KeyValueStorage/Capabilities/IManageKeyValuePairs.php @@ -1,6 +1,6 @@ 0) { $condition_string = " WHERE (" . array_shift($condition) . ")"; diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php index 7de6799cf..645084a96 100644 --- a/src/Database/DBStructure.php +++ b/src/Database/DBStructure.php @@ -1,6 +1,6 @@ ['last-item' => true], 'limit' => $totallimit] ); @@ -451,7 +451,7 @@ class Relation ["NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?) AND `nurl` = `nurl`) AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?) AND NOT `uri-id` IN (SELECT `uri-id` FROM `account-suggestion` WHERE `uri-id` = `contact`.`uri-id` AND `uid` = ?)", - $uid, Contact::FRIEND, Contact::SHARING, 0, + $uid, Contact::FRIEND, Contact::SHARING, 0, Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus, $uid], ['order' => ['last-item' => true], 'limit' => $totallimit] ); @@ -477,7 +477,7 @@ class Relation public static function countFollows(int $cid, array $condition = []): int { $condition = DBA::mergeConditions($condition, [ - '`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)', + '`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)', $cid, ]); @@ -498,7 +498,7 @@ class Relation public static function listFollows(int $cid, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false) { $condition = DBA::mergeConditions($condition, - ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)', + ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)', $cid] ); diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php index 1452369e5..a3091f7d8 100644 --- a/src/Model/Contact/User.php +++ b/src/Model/Contact/User.php @@ -1,6 +1,6 @@ $cid, 'private' => [Item::PUBLIC, Item::UNLISTED], 'deleted' => false, 'type' => $type]); } diff --git a/src/Model/Post/Content.php b/src/Model/Post/Content.php index 63ea9b8cd..0694b3a37 100644 --- a/src/Model/Post/Content.php +++ b/src/Model/Post/Content.php @@ -1,6 +1,6 @@ $id, 'uri-id' => $uriId, 'url' => $url]); - } else { + } else { $fields = self::fetchMimeType($url); $fields['uri-id'] = $uriId; $fields['url'] = $url; diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php index 28526b5b0..074cee522 100644 --- a/src/Model/Post/Media.php +++ b/src/Model/Post/Media.php @@ -1,6 +1,6 @@ selectPublicFieldsByUserId($uid); $profile = self::formatProfile($profile, $profileFields); diff --git a/src/Module/Api/GNUSocial/GNUSocial/Config.php b/src/Module/Api/GNUSocial/GNUSocial/Config.php index ed27b8ef3..94d155cda 100644 --- a/src/Module/Api/GNUSocial/GNUSocial/Config.php +++ b/src/Module/Api/GNUSocial/GNUSocial/Config.php @@ -1,6 +1,6 @@ ['pid' => true], 'limit' => $request['limit']]; $condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; - + if (!empty($request['max_id'])) { $condition = DBA::mergeConditions($condition, ["`pid` < ?", $request['max_id']]); } - + if (!empty($request['since_id'])) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['since_id']]); } - + if (!empty($request['min_id'])) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['min_id']]); - + $params['order'] = ['pid']; } - + $accounts = []; - + foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) { self::setBoundaries($follower['pid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['pid'], $uid); @@ -85,23 +85,23 @@ class Followers extends BaseApi $params = ['order' => ['relation-cid' => true], 'limit' => $request['limit']]; $condition = ['cid' => $id, 'follows' => true]; - + if (!empty($request['max_id'])) { $condition = DBA::mergeConditions($condition, ["`relation-cid` < ?", $request['max_id']]); } - + if (!empty($request['since_id'])) { $condition = DBA::mergeConditions($condition, ["`relation-cid` > ?", $request['since_id']]); } - + if (!empty($request['min_id'])) { $condition = DBA::mergeConditions($condition, ["`relation-cid` > ?", $request['min_id']]); - + $params['order'] = ['relation-cid']; } - + $accounts = []; - + $followers = DBA::select('contact-relation', ['relation-cid'], $condition, $params); while ($follower = DBA::fetch($followers)) { self::setBoundaries($follower['relation-cid']); diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php index aca6bd5a8..2aa0cad05 100644 --- a/src/Module/Api/Mastodon/Accounts/Following.php +++ b/src/Module/Api/Mastodon/Accounts/Following.php @@ -1,6 +1,6 @@ getRequest([ 'max_id' => 0, // Return results older than this id 'since_id' => 0, // Return results newer than this id - 'min_id' => 0, // Return results immediately newer than id + 'min_id' => 0, // Return results immediately newer than id 'limit' => 40, // Maximum number of results to return. Defaults to 40. ], $request); @@ -60,23 +60,23 @@ class Following extends BaseApi $params = ['order' => ['pid' => true], 'limit' => $request['limit']]; $condition = ['uid' => $uid, 'self' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]]; - + if (!empty($request['max_id'])) { $condition = DBA::mergeConditions($condition, ["`pid` < ?", $request['max_id']]); } - + if (!empty($request['since_id'])) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['since_id']]); } - + if (!empty($request['min_id'])) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $request['min_id']]); - + $params['order'] = ['pid']; } - + $accounts = []; - + foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) { self::setBoundaries($follower['pid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['pid'], $uid); diff --git a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php index a92480822..8e2e7292b 100644 --- a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php +++ b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php @@ -1,6 +1,6 @@ UnprocessableEntity(DI::l10n()->t('Missing parameters')); } diff --git a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php index 286bb695a..ef9c775c1 100644 --- a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php +++ b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php @@ -1,6 +1,6 @@ getRequest([ 'max_id' => 0, // Return results older than this id 'since_id' => 0, // Return results newer than this id - 'min_id' => 0, // Return results immediately newer than id + 'min_id' => 0, // Return results immediately newer than id 'limit' => 40, // Maximum number of results. Defaults to 40. Max 40. Set to 0 in order to get all accounts without pagination. ], $request); diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php index 0121acf24..a00b0f831 100644 --- a/src/Module/Api/Mastodon/Markers.php +++ b/src/Module/Api/Mastodon/Markers.php @@ -1,6 +1,6 @@ UnprocessableEntity(); } - + $media = Photo::upload($uid, $_FILES['file']); if (empty($media)) { DI::mstdnError()->UnprocessableEntity(); diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php index 72fdb25f2..2190c397c 100644 --- a/src/Module/Api/Mastodon/Mutes.php +++ b/src/Module/Api/Mastodon/Mutes.php @@ -1,6 +1,6 @@ RecordNotFound(); } - + if (!Item::markForDeletionById($item['id'])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Suggestions.php b/src/Module/Api/Mastodon/Suggestions.php index f25b4cacf..9645d39a2 100644 --- a/src/Module/Api/Mastodon/Suggestions.php +++ b/src/Module/Api/Mastodon/Suggestions.php @@ -1,6 +1,6 @@ ['pid' => true], 'limit' => $count]; $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; - + $total_count = (int)DBA::count('contact', $condition); if (!empty($max_id)) { $condition = DBA::mergeConditions($condition, ["`pid` < ?", $max_id]); } - + if (!empty($since_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $since_id]); } - + if (!empty($min_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $min_id]); - + $params['order'] = ['pid']; } - + $ids = []; - + foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) { self::setBoundaries($follower['pid']); $ids[] = $follower['pid']; diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php index 04bddf83c..4a141f140 100644 --- a/src/Module/Api/Twitter/Followers/Lists.php +++ b/src/Module/Api/Twitter/Followers/Lists.php @@ -1,6 +1,6 @@ ['pid' => true], 'limit' => $count]; $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]; - + $total_count = (int)DBA::count('contact', $condition); if (!empty($max_id)) { $condition = DBA::mergeConditions($condition, ["`pid` < ?", $max_id]); } - + if (!empty($since_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $since_id]); } - + if (!empty($min_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $min_id]); - + $params['order'] = ['pid']; } - + $ids = []; - + foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) { self::setBoundaries($follower['pid']); $ids[] = $follower['pid']; @@ -112,7 +112,7 @@ class Lists extends ContactEndpoint $return = self::list($ids, $total_count, $uid, $cursor, $count, $skip_status, $include_user_entities); - $this->response->setHeader(self::getLinkHeader()); + $this->response->setHeader(self::getLinkHeader()); $this->response->exit('lists', ['lists' => $return]); } diff --git a/src/Module/Api/Twitter/Friends/Ids.php b/src/Module/Api/Twitter/Friends/Ids.php index d12e082cf..0f0523e12 100644 --- a/src/Module/Api/Twitter/Friends/Ids.php +++ b/src/Module/Api/Twitter/Friends/Ids.php @@ -1,6 +1,6 @@ ['pid' => true], 'limit' => $count]; $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]]; - + $total_count = (int)DBA::count('contact', $condition); if (!empty($max_id)) { $condition = DBA::mergeConditions($condition, ["`pid` < ?", $max_id]); } - + if (!empty($since_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $since_id]); } - + if (!empty($min_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $min_id]); - + $params['order'] = ['pid']; } - + $ids = []; - + foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) { self::setBoundaries($follower['pid']); $ids[] = $follower['pid']; diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php index 1abce5364..534a30aac 100644 --- a/src/Module/Api/Twitter/Friends/Lists.php +++ b/src/Module/Api/Twitter/Friends/Lists.php @@ -1,6 +1,6 @@ ['pid' => true], 'limit' => $count]; $condition = ['uid' => $uid, 'self' => false, 'pending' => false, 'rel' => [Contact::SHARING, Contact::FRIEND]]; - + $total_count = (int)DBA::count('contact', $condition); if (!empty($max_id)) { $condition = DBA::mergeConditions($condition, ["`pid` < ?", $max_id]); } - + if (!empty($since_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $since_id]); } - + if (!empty($min_id)) { $condition = DBA::mergeConditions($condition, ["`pid` > ?", $min_id]); - + $params['order'] = ['pid']; } - + $ids = []; - + foreach (Contact::selectAccountToArray(['pid'], $condition, $params) as $follower) { self::setBoundaries($follower['pid']); $ids[] = $follower['pid']; @@ -112,7 +112,7 @@ class Lists extends ContactEndpoint $return = self::list($ids, $total_count, $uid, $cursor, $count, $skip_status, $include_user_entities); - $this->response->setHeader(self::getLinkHeader()); + $this->response->setHeader(self::getLinkHeader()); $this->response->exit('lists', ['lists' => $return]); } diff --git a/src/Module/Api/Twitter/Friendships/Destroy.php b/src/Module/Api/Twitter/Friendships/Destroy.php index d324fc6be..bf769bace 100644 --- a/src/Module/Api/Twitter/Friendships/Destroy.php +++ b/src/Module/Api/Twitter/Friendships/Destroy.php @@ -1,6 +1,6 @@ response->setHeader(self::getLinkHeader()); + $this->response->setHeader(self::getLinkHeader()); $this->response->exit('incoming', ['incoming' => $return]); } diff --git a/src/Module/Api/Twitter/Friendships/Show.php b/src/Module/Api/Twitter/Friendships/Show.php index c05dc0902..5e9656a71 100644 --- a/src/Module/Api/Twitter/Friendships/Show.php +++ b/src/Module/Api/Twitter/Friendships/Show.php @@ -1,6 +1,6 @@ t('Permission denied.')); } break; - } + } } return parent::run($httpException, $request); diff --git a/src/Module/BaseModeration.php b/src/Module/BaseModeration.php index 1261eebb1..3de46b319 100644 --- a/src/Module/BaseModeration.php +++ b/src/Module/BaseModeration.php @@ -1,6 +1,6 @@ getLocalUserId()]); } diff --git a/src/Module/Credits.php b/src/Module/Credits.php index d0b902a51..d16879f7d 100644 --- a/src/Module/Credits.php +++ b/src/Module/Credits.php @@ -1,6 +1,6 @@ installer->installDatabase(); - + // install allowed themes to register theme hooks // this is same as "Reload active theme" in /admin/themes $allowed_themes = Theme::getAllowedList(); diff --git a/src/Module/Invite.php b/src/Module/Invite.php index 19519938d..deefc44bb 100644 --- a/src/Module/Invite.php +++ b/src/Module/Invite.php @@ -1,6 +1,6 @@ $starred], ['id' => $itemId]); diff --git a/src/Module/Magic.php b/src/Module/Magic.php index c300e5971..8fa67ec97 100644 --- a/src/Module/Magic.php +++ b/src/Module/Magic.php @@ -1,6 +1,6 @@ getLocalUserId()); - + // Loop through all introduction notifications.This creates an array with the output html for each // introduction /** @var Introduction $Introduction */ @@ -152,7 +152,7 @@ class Introductions extends BaseNotifications $helptext = $this->t('Shall your connection be bidirectional or not?'); $helptext2 = $this->t('Accepting %s as a friend allows %s to subscribe to your posts, and you will also receive updates from them in your news feed.', $convertedName, $convertedName); $helptext3 = $this->t('Accepting %s as a subscriber allows them to subscribe to your posts, but you will not receive updates from them in your news feed.', $convertedName); - + $friend = ['duplex', $this->t('Friend'), '1', $helptext2, true]; $follower = ['duplex', $this->t('Subscriber'), '0', $helptext3, false]; diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php index ff33dd41a..70590c01f 100644 --- a/src/Module/Notifications/Notification.php +++ b/src/Module/Notifications/Notification.php @@ -1,6 +1,6 @@ baseUrl->redirect('profile/' . $this->parameters['nickname']); } - + if (empty($this->owner)) { $this->systemMessages->addNotice($this->t('Profile unavailable.')); return; diff --git a/src/Module/Profile/Restricted.php b/src/Module/Profile/Restricted.php index 31ce69fbd..c4f972077 100644 --- a/src/Module/Profile/Restricted.php +++ b/src/Module/Profile/Restricted.php @@ -1,6 +1,6 @@ [ '@attributes' => [ 'rel' => 'http://oexchange.org/spec/0.8/rel/resident-target', - 'type' => 'application/xrd+xml', + 'type' => 'application/xrd+xml', 'href' => $domain . '/oexchange/xrd' ] ], @@ -97,7 +97,7 @@ class HostMeta extends BaseModule ] ], ], $xml, false, ['hm' => 'http://host-meta.net/xrd/1.0', 'mk' => 'http://salmon-protocol.org/ns/magic-key']); - + System::httpExit($xml->saveXML(), Response::TYPE_XML, 'application/xrd+xml'); } } diff --git a/src/Module/WellKnown/NodeInfo.php b/src/Module/WellKnown/NodeInfo.php index 0feb5e379..e1c486c2e 100644 --- a/src/Module/WellKnown/NodeInfo.php +++ b/src/Module/WellKnown/NodeInfo.php @@ -1,6 +1,6 @@ uid, ['language']); $l10n = $this->l10n->withLang($user['language']); - + $causer = $author = Contact::getById($Notification->actorId, ['id', 'name', 'url', 'contact-type', 'pending']); if (empty($causer)) { $this->logger->info('Causer not found', ['contact' => $Notification->actorId]); diff --git a/src/Navigation/Notifications/Factory/Notify.php b/src/Navigation/Notifications/Factory/Notify.php index d6c777e6f..c180d4121 100644 --- a/src/Navigation/Notifications/Factory/Notify.php +++ b/src/Navigation/Notifications/Factory/Notify.php @@ -1,6 +1,6 @@ $approfile['generator']['url'] . '/receive/public', 'notify' => $owner['notify'], 'poll' => $owner['poll'], - 'poco' => $owner['poco'], + 'poco' => $owner['poco'], 'network' => Protocol::DIASPORA, 'pubkey' => $owner['upubkey'], ] diff --git a/src/Object/Api/Friendica/Group.php b/src/Object/Api/Friendica/Group.php index 36dd6df6c..ce75f9eec 100644 --- a/src/Object/Api/Friendica/Group.php +++ b/src/Object/Api/Friendica/Group.php @@ -1,6 +1,6 @@ appendChild($author); } diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php index 4b7eb16d4..028a7885b 100644 --- a/src/Protocol/Relay.php +++ b/src/Protocol/Relay.php @@ -1,6 +1,6 @@ $server['url'], 'success' => $success]); - } + } } } diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php index 7e91b0e3e..7685c1dd9 100644 --- a/src/Protocol/Salmon.php +++ b/src/Protocol/Salmon.php @@ -1,6 +1,6 @@ 'view/' . self::SMARTY3_TEMPLATE_FOLDER . '/']; $this->setTemplateDir($template_dirs); - + $work_dir = rtrim($work_dir, '/'); $this->setCompileDir($work_dir . '/compiled'); diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php index 201d99f82..5d7ed6c0c 100644 --- a/src/Render/FriendicaSmartyEngine.php +++ b/src/Render/FriendicaSmartyEngine.php @@ -1,6 +1,6 @@ 'text/plain', 'htm' => 'text/html', 'html' => 'text/html', @@ -44,7 +44,7 @@ class Mimetype 'xml' => 'application/xml', 'swf' => 'application/x-shockwave-flash', 'flv' => 'video/x-flv', - + // images 'png' => 'image/png', 'jpe' => 'image/jpeg', @@ -57,14 +57,14 @@ class Mimetype 'tif' => 'image/tiff', 'svg' => 'image/svg+xml', 'svgz' => 'image/svg+xml', - + // archives 'zip' => 'application/zip', 'rar' => 'application/x-rar-compressed', 'exe' => 'application/x-msdownload', 'msi' => 'application/x-msdownload', 'cab' => 'application/vnd.ms-cab-compressed', - + // audio/video 'mp3' => 'audio/mpeg', 'wav' => 'audio/wav', @@ -75,14 +75,14 @@ class Mimetype 'avi' => 'video/x-msvideo', 'wmv' => 'video/x-ms-wmv', 'wma' => 'audio/x-ms-wma', - + // adobe 'pdf' => 'application/pdf', 'psd' => 'image/vnd.adobe.photoshop', 'ai' => 'application/postscript', 'eps' => 'application/postscript', 'ps' => 'application/postscript', - + // ms office 'doc' => 'application/msword', 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', @@ -91,12 +91,12 @@ class Mimetype 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ppt' => 'application/vnd.ms-powerpoint', 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', - - + + // open office 'odt' => 'application/vnd.oasis.opendocument.text', 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',*/ - + // Assembled from the original Friendica list and // lists from http://www.freeformatter.com/mime-types-list.html // and http://www.webmaster-toolkit.com/mime-types.shtml @@ -1088,7 +1088,7 @@ class Mimetype 'zoo' => 'application/octet-stream', 'zsh' => 'text/x-script.zsh' ]; - + $dot = strrpos($filename, '.'); if ($dot !== false) { $ext = strtolower(substr($filename, $dot + 1)); diff --git a/src/Util/Network.php b/src/Util/Network.php index 5a06a0056..b7954d8e4 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -1,6 +1,6 @@ true, HttpClientOptions::TIMEOUT => $xrd_timeout]; $curlResult = DI::httpClient()->head($url, $options); - + // Workaround for systems that can't handle a HEAD request. Don't retry on timeouts. if (!$curlResult->isSuccess() && ($curlResult->getReturnCode() >= 400) && !in_array($curlResult->getReturnCode(), [408, 504])) { $curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, $options); } - + if (!$curlResult->isSuccess()) { Logger::notice('Url not reachable', ['host' => $host, 'url' => $url]); return false; @@ -481,7 +481,7 @@ class Network $scheme = $get('scheme'); $query = $get('query'); $fragment = $get('fragment'); - $authority = ($userinfo !== null ? $userinfo . '@' : '') . + $authority = ($userinfo !== null ? $userinfo . '@' : '') . $get('host') . ($port ? ":$port" : ''); diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index 5b0bf6a5c..f21528353 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -1,6 +1,6 @@ $photo['id']]); diff --git a/src/Worker/RemoveUnusedContacts.php b/src/Worker/RemoveUnusedContacts.php index 1cbb3775c..4187ed005 100644 --- a/src/Worker/RemoveUnusedContacts.php +++ b/src/Worker/RemoveUnusedContacts.php @@ -1,6 +1,6 @@ $contact['id']]); DBA::delete('post', ['author-id' => $contact['id']]); DBA::delete('post', ['causer-id' => $contact['id']]); - + DBA::delete('post-thread', ['owner-id' => $contact['id']]); DBA::delete('post-thread', ['author-id' => $contact['id']]); DBA::delete('post-thread', ['causer-id' => $contact['id']]); diff --git a/src/Worker/RemoveUnusedTags.php b/src/Worker/RemoveUnusedTags.php index ecb724c38..2090effdd 100644 --- a/src/Worker/RemoveUnusedTags.php +++ b/src/Worker/RemoveUnusedTags.php @@ -1,6 +1,6 @@ fetch($gserver['url'] . '/api/v1/directory?order=new&local=true&limit=200&offset=0', HttpClientAccept::JSON); if (empty($result)) { Logger::info('Empty result', ['url' => $gserver['url']]); diff --git a/src/Worker/UpdateServerPeers.php b/src/Worker/UpdateServerPeers.php index 9ddbdcd56..681c1a231 100644 --- a/src/Worker/UpdateServerPeers.php +++ b/src/Worker/UpdateServerPeers.php @@ -1,6 +1,6 @@ expectException(\Exception::class); $this->expectExceptionMessageMatches("/(.*) is not a valid basepath/"); - + $basepath = new BasePath('/now23452sgfgas', []); $basepath->getPath(); } diff --git a/tests/src/Util/BaseURLTest.php b/tests/src/Util/BaseURLTest.php index 0702f88b4..0be83be0a 100644 --- a/tests/src/Util/BaseURLTest.php +++ b/tests/src/Util/BaseURLTest.php @@ -1,6 +1,6 @@ . * * The site template for pure content (e.g. (modals) - * + * * This themplate is used e.g for bs modals. So outputs * only the pure content */ diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php index a64f6f5fe..5f86976b9 100644 --- a/view/theme/duepuntozero/config.php +++ b/view/theme/duepuntozero/config.php @@ -1,6 +1,6 @@