diff --git a/.env.example b/.env.example index dc1d920c..7ce2d8b5 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -APP_NAME="PixelFed Prod" +APP_NAME="Pixelfed Prod" APP_ENV=production APP_KEY= APP_DEBUG=false diff --git a/.env.testing b/.env.testing index 8eb8d23d..2794527a 100644 --- a/.env.testing +++ b/.env.testing @@ -1,4 +1,4 @@ -APP_NAME="PixelFed Test" +APP_NAME="Pixelfed Test" APP_ENV=local APP_KEY=base64:lwX95GbNWX3XsucdMe0XwtOKECta3h/B+p9NbH2jd0E= APP_DEBUG=true diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php index b6918fc4..d8941883 100644 --- a/app/Http/Controllers/FederationController.php +++ b/app/Http/Controllers/FederationController.php @@ -287,7 +287,7 @@ XML; $actor = Profile::whereKeyId($keyId)->whereNotNull('remote_url')->firstOrFail(); $res = Zttp::timeout(5)->withHeaders([ 'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', - 'User-Agent' => 'PixelFedBot v0.1 - https://pixelfed.org', + 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', ])->get($actor->remote_url); $res = json_decode($res->body(), true, 8); if($res['publicKey']['id'] !== $actor->key_id) { diff --git a/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php b/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php index 0d8dcffb..db70b24b 100644 --- a/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php +++ b/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php @@ -66,7 +66,7 @@ class RemoteFollowImportRecent implements ShouldQueue return; } $response = Zttp::withHeaders([ - 'User-Agent' => 'PixelFedBot v0.1 - https://pixelfed.org', + 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', ])->get($url); $this->outbox = $response->json(); diff --git a/app/Jobs/RemoteFollowPipeline/RemoteFollowPipeline.php b/app/Jobs/RemoteFollowPipeline/RemoteFollowPipeline.php index 5a69e44a..92e5f8de 100644 --- a/app/Jobs/RemoteFollowPipeline/RemoteFollowPipeline.php +++ b/app/Jobs/RemoteFollowPipeline/RemoteFollowPipeline.php @@ -64,7 +64,7 @@ class RemoteFollowPipeline implements ShouldQueue $client = new Client(['handler' => $handlerStack]); $response = Zttp::withHeaders([ 'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', - 'User-Agent' => 'PixelFedBot v0.1 - https://pixelfed.org', + 'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org', ])->get($url); $this->response = $response->json(); diff --git a/app/Util/ActivityPub/DiscoverActor.php b/app/Util/ActivityPub/DiscoverActor.php index 6229519f..61023900 100644 --- a/app/Util/ActivityPub/DiscoverActor.php +++ b/app/Util/ActivityPub/DiscoverActor.php @@ -18,7 +18,7 @@ class DiscoverActor { $res = Zttp::withHeaders([ 'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', - 'User-Agent' => 'PixelFedBot - https://pixelfed.org', + 'User-Agent' => 'PixelfedBot - https://pixelfed.org', ])->get($this->url); $this->response = $res->body(); diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index f02e73af..e38b4ca0 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -178,7 +178,7 @@ class Helpers { { return [ 'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', - 'User-Agent' => 'PixelFedBot - https://pixelfed.org', + 'User-Agent' => 'PixelfedBot - https://pixelfed.org', ]; } diff --git a/config/pixelfed.php b/config/pixelfed.php index 34264e90..cae06020 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -17,10 +17,10 @@ return [ /* |-------------------------------------------------------------------------- - | PixelFed Version + | Pixelfed Version |-------------------------------------------------------------------------- | - | This value is the version of your PixelFed instance. + | This value is the version of your Pixelfed instance. | */ 'version' => '0.9.4', diff --git a/public/js/timeline.js b/public/js/timeline.js index 887df97e..d44eaca3 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/manifest.json b/public/manifest.json index 03aeb564..71401db0 100644 Binary files a/public/manifest.json and b/public/manifest.json differ diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index a5e9a7d0..1e29f8ae 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -311,7 +311,7 @@ API

- Powered by PixelFed + Powered by Pixelfed

diff --git a/resources/views/layouts/partial/footer.blade.php b/resources/views/layouts/partial/footer.blade.php index 0dab40fd..cf491338 100644 --- a/resources/views/layouts/partial/footer.blade.php +++ b/resources/views/layouts/partial/footer.blade.php @@ -8,7 +8,7 @@ {{__('site.privacy')}} API {{__('site.language')}} - Powered by PixelFed + Powered by Pixelfed

diff --git a/resources/views/profile/bookmarks.blade.php b/resources/views/profile/bookmarks.blade.php index 52ed7284..bed1acd4 100644 --- a/resources/views/profile/bookmarks.blade.php +++ b/resources/views/profile/bookmarks.blade.php @@ -96,7 +96,7 @@ @push('meta') - + @if(false == $settings->crawlable || $user->remote_url) @endif diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index ae29ff99..30a3e92e 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -17,7 +17,7 @@ @if(false == $settings['crawlable'] || $profile->remote_url) @else - + @endif @endpush diff --git a/resources/views/site/developer.blade.php b/resources/views/site/developer.blade.php index 6d52d396..c3a853ce 100644 --- a/resources/views/site/developer.blade.php +++ b/resources/views/site/developer.blade.php @@ -7,7 +7,7 @@
-

Developers can use PixelFed APIs to build rich experiences and extend PixelFed in new ways.

+

Developers can use Pixelfed APIs to build rich experiences and extend Pixelfed in new ways.

diff --git a/resources/views/site/opensource.blade.php b/resources/views/site/opensource.blade.php index 7ddb492f..cb2e7c77 100644 --- a/resources/views/site/opensource.blade.php +++ b/resources/views/site/opensource.blade.php @@ -12,5 +12,5 @@ @endsection @push('meta') - + @endpush diff --git a/resources/views/site/privacy.blade.php b/resources/views/site/privacy.blade.php index 0a74398a..d820f819 100644 --- a/resources/views/site/privacy.blade.php +++ b/resources/views/site/privacy.blade.php @@ -16,7 +16,7 @@ Posts, following and other public information: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.
  • - Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it’s important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over PixelFed. + Direct and followers-only posts: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it’s important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. Please keep in mind that the operators of the server and any receiving server may view such messages, and that recipients may screenshot, copy or otherwise re-share them. Do not share any dangerous information over Pixelfed.
  • IPs and other metadata: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server. @@ -27,7 +27,7 @@

    Any of the information we collect from you may be used in the following ways:

    • - To provide the core functionality of PixelFed. You can only interact with other people’s content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline. + To provide the core functionality of Pixelfed. You can only interact with other people’s content and post your own content when you are logged in. For example, you may follow other people to view their combined posts in your own personalized home timeline.
    • To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations. diff --git a/resources/views/timeline/template.blade.php b/resources/views/timeline/template.blade.php index e57f349f..83737a4d 100644 --- a/resources/views/timeline/template.blade.php +++ b/resources/views/timeline/template.blade.php @@ -117,7 +117,7 @@ API

      - Powered by PixelFed + Powered by Pixelfed