From 39266ca51b2bbc51f6c75fb456f7de9f9db7827a Mon Sep 17 00:00:00 2001
From: Django Doucet <djunglelabs@gmail.com>
Date: Wed, 15 Jan 2020 23:08:53 -0500
Subject: [PATCH] fixed a few regressions

---
 fediembedi-settings-form.tpl.php                            | 4 ++--
 fediembedi.php                                              | 3 +--
 templates/{fediembedi-mastodon.tpl.php => mastodon.tpl.php} | 2 +-
 templates/{fediembedi-peertube.tpl.php => peertube.tpl.php} | 4 ++--
 templates/{fediembedi-pixelfed.tpl.php => pixelfed.tpl.php} | 0
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename templates/{fediembedi-mastodon.tpl.php => mastodon.tpl.php} (99%)
 rename templates/{fediembedi-peertube.tpl.php => peertube.tpl.php} (99%)
 rename templates/{fediembedi-pixelfed.tpl.php => pixelfed.tpl.php} (100%)

diff --git a/fediembedi-settings-form.tpl.php b/fediembedi-settings-form.tpl.php
index e962f27..c5999d3 100644
--- a/fediembedi-settings-form.tpl.php
+++ b/fediembedi-settings-form.tpl.php
@@ -13,8 +13,8 @@ define("FEDI_CONNECTED",isset($account) && $account !== null);
 		<div style="display:<?php echo !FEDI_CONNECTED ? "block":"none"?>">
 				<input type="text" class="widefat instance_url" id="instance" name="instance" size="80" value="<?php esc_url_raw( $instance, 'https' ); ?>" list="mInstances">
 				<select class="widefat instance_type" id="instance_type" name="instance_type" value="<?php sanitize_key( $instance_type ); ?>">
-					<option value="mastodon">Mastodon/Pleroma</option>
-					<option value="pixelfed">Pixelfed</option>
+					<option value="Mastodon">Mastodon/Pleroma</option>
+					<option value="Pixelfed">Pixelfed</option>
 				</select>
 				<input class="button button-primary" type="submit" value="<?php esc_attr_e( 'Connect to your instance', 'fediembedi' ); ?>" name="save" id="save">
 				<br><small><?php _e( 'The currently supported software are Mastodon, Pleroma, Pixelfed.', 'fediembedi' ); ?></small><br>
diff --git a/fediembedi.php b/fediembedi.php
index 352d193..529eff9 100644
--- a/fediembedi.php
+++ b/fediembedi.php
@@ -108,7 +108,7 @@ class FediConfig
     		        break;
     		      case 'Pixelfed':
                 wp_enqueue_style( 'bootstrap', plugin_dir_url( __FILE__ ) . 'assets/bootstrap/css/bootstrap.min.css', array(), '4.4.1' );
-                wp_enqueue_style( 'pixelfed', plugin_dir_url( __FILE__ ) . 'assets/pixelfed.css', array(), filemtime(plugin_dir_path( __FILE__ ) . 'pixelfed/pixelfed.css') );
+                wp_enqueue_style( 'pixelfed', plugin_dir_url( __FILE__ ) . 'assets/pixelfed.css', array(), filemtime(plugin_dir_path( __FILE__ ) . 'assets/pixelfed.css') );
                 //https://css-tricks.com/lozad-js-performant-lazy-loading-images/ lazyloading for background images
     		        break;
     		      default:
@@ -167,7 +167,6 @@ class FediConfig
                 $client = new \FediClient($instance);
                 $redirect_url = get_admin_url();
 
-                $instance_type = get_option('fediembedi-instance-type');
                 switch ($instance_type) {
                     case 'Mastodon':
                       $auth_url = $client->register_app($redirect_url);
diff --git a/templates/fediembedi-mastodon.tpl.php b/templates/mastodon.tpl.php
similarity index 99%
rename from templates/fediembedi-mastodon.tpl.php
rename to templates/mastodon.tpl.php
index c91e4a3..c7b305c 100644
--- a/templates/fediembedi-mastodon.tpl.php
+++ b/templates/mastodon.tpl.php
@@ -15,7 +15,7 @@
             </a>
             <div class="spacer"></div>
             <div class="account__header__tabs__buttons">
-              <a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi')</a>
+              <a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi'); ?></a>
             </div>
           </div>
           <div class="account__header__tabs__name">
diff --git a/templates/fediembedi-peertube.tpl.php b/templates/peertube.tpl.php
similarity index 99%
rename from templates/fediembedi-peertube.tpl.php
rename to templates/peertube.tpl.php
index c91e4a3..eb29714 100644
--- a/templates/fediembedi-peertube.tpl.php
+++ b/templates/peertube.tpl.php
@@ -1,4 +1,4 @@
-<!-- mastodon -->
+<!-- peertube -->
 <div class="scrollable" style="height: <?php echo $height; ?>;">
   <div role="feed">
     <?php if($show_header): ?>
@@ -15,7 +15,7 @@
             </a>
             <div class="spacer"></div>
             <div class="account__header__tabs__buttons">
-              <a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi')</a>
+              <a href="<?php echo $status[0]->account->url; ?>" rel="noreferrer noopener" class="button logo-button"><?php _e('Follow', 'fediembedi'); ?></a>
             </div>
           </div>
           <div class="account__header__tabs__name">
diff --git a/templates/fediembedi-pixelfed.tpl.php b/templates/pixelfed.tpl.php
similarity index 100%
rename from templates/fediembedi-pixelfed.tpl.php
rename to templates/pixelfed.tpl.php