Merge pull request #1361 from kstrauser/consistent-naming

PixelFed -> Pixelfed

.env.example

@@ -1,4 +1,4 @@
-APP_NAME="PixelFed Prod"
+APP_NAME="Pixelfed Prod"
 APP_ENV=production
 APP_KEY=
 APP_DEBUG=false

.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

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) {

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();

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();
 

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();
 

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',
 		];
 	}
 

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',

resources/assets/js/components/Timeline.vue

@@ -311,7 +311,7 @@
 							<a href="/site/platform" class="text-dark pr-2">API</a>
 						</p>
 						<p class="mb-0 text-uppercase font-weight-bold text-muted small">
-							<a href="http://pixelfed.org" class="text-muted" rel="noopener" title="" data-toggle="tooltip">Powered by PixelFed</a>
+							<a href="http://pixelfed.org" class="text-muted" rel="noopener" title="" data-toggle="tooltip">Powered by Pixelfed</a>
 						</p>
 					</div>
 				</footer>

resources/views/layouts/partial/footer.blade.php

@@ -8,7 +8,7 @@
           <a href="{{route('site.privacy')}}" class="text-primary pr-3">{{__('site.privacy')}}</a>
           <a href="{{route('site.platform')}}" class="text-primary pr-3">API</a>
           <a href="{{route('site.language')}}" class="text-primary pr-3">{{__('site.language')}}</a>
-          <a href="https://pixelfed.org" class="text-muted float-right" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by PixelFed</a>
+          <a href="https://pixelfed.org" class="text-muted float-right" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by Pixelfed</a>
         </p>
     </div>
   </footer>

resources/views/profile/bookmarks.blade.php

@@ -96,7 +96,7 @@
 
 @push('meta')<meta property="og:description" content="{{$user->bio}}">
     <meta property="og:image" content="{{$user->avatarUrl()}}">
-    <link href="{{$user->permalink('.atom')}}" rel="alternate" title="{{$user->username}} on PixelFed" type="application/atom+xml">
+    <link href="{{$user->permalink('.atom')}}" rel="alternate" title="{{$user->username}} on Pixelfed" type="application/atom+xml">
   @if(false == $settings->crawlable || $user->remote_url)
   <meta name="robots" content="noindex, nofollow">
   @endif

resources/views/profile/show.blade.php

@@ -17,7 +17,7 @@
   @if(false == $settings['crawlable'] || $profile->remote_url)
   <meta name="robots" content="noindex, nofollow">
   @else  <meta property="og:image" content="{{$profile->avatarUrl()}}">
-    <link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on PixelFed" type="application/atom+xml">
+    <link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on Pixelfed" type="application/atom+xml">
     <link href='{{$profile->permalink()}}' rel='alternate' type='application/activity+json'>
   @endif
 @endpush

resources/views/site/developer.blade.php

@@ -7,7 +7,7 @@
   </div>
   <hr>
   <section>
-    <p class="lead">Developers can use PixelFed APIs to build rich experiences and extend PixelFed in new ways.</p>
+    <p class="lead">Developers can use Pixelfed APIs to build rich experiences and extend Pixelfed in new ways.</p>
     <div class="row pt-5">
       <div class="col-12 col-md-6 pb-3">
         <div class="card">

resources/views/site/opensource.blade.php

@@ -12,5 +12,5 @@
 @endsection
 
 @push('meta')
-<meta property="og:description" content="Open source in PixelFed">
+<meta property="og:description" content="Open source in Pixelfed">
 @endpush

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.
       </li>
       <li>
-        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.
       </li>
       <li>
         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 @@
     <p class="">Any of the information we collect from you may be used in the following ways:</p>
     <ul class=" pl-4">
       <li>
-        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.
       </li>
       <li>
         To aid moderation of the community, for example comparing your IP address with other known ones to determine ban evasion or other violations.

resources/views/timeline/template.blade.php

@@ -117,7 +117,7 @@
                 <a href="{{route('site.platform')}}" class="text-dark pr-2">API</a>
               </p>
               <p class="mb-0 text-uppercase font-weight-bold text-muted small">
-                <a href="http://pixelfed.org" class="text-muted" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by PixelFed</a>
+                <a href="http://pixelfed.org" class="text-muted" rel="noopener" title="version {{config('pixelfed.version')}}" data-toggle="tooltip">Powered by Pixelfed</a>
               </p>
           </div>
         </footer>