changes and fixes

website/_data/anyat.yml

@@ -17,6 +17,13 @@ settings:
   #  you want to process.
   process_collections: true
 
+# Default linker to use if no platform is specified.
+# This allows @'s of the format [platform]@username[@domain], allowing
+#  implicit platform.
+# For example, if default_platform was twitter, then @user would be
+#  equivalent to twitter@user.
+#default_platform: email
+
 # Linkers configuration
 # Each linker defines how to format and link a specific platform or service.
 # The badge will display an icon showing what the link is for.
@@ -51,7 +58,7 @@ linkers:
     format_domain: "@^u@^d"
     link: "https://w.linuxposting.xyz/blog/^u"
     link_domain: "https://w.linuxposting.xyz/blog/@^u@^d"
-  fedi: mainwafrn # alias fedi to use wafrn
+  fedi: mainwafrn
   mainwafrn: # For less clunky main wafrn links
     badge: "w"
     format: "@^u"
@@ -61,9 +68,14 @@ linkers:
   matrix:
     badge: "[M]"
     domain: "linuxposting.xyz" # default domain is local
-    format: "@^u"
+    # format: "@^u"
     format_domain: "@^u:^d"
     link_domain: "https://matrix.to/#/@^u:^d"
+  mroom: # matrix room
+    badge: "[M]"
+    domain: "linuxposting.xyz"
+    format_domain: "#^u:^d"
+    link_domain: "https://matrix.to/#/#^u:^d"
   mail: email
   email:
     badge: "\U000f01ee" # nf-md-email
@@ -93,7 +105,3 @@ linkers:
     badge: "\U000f044d" # nf-md-reddit
     format: "u/^u"
     link: "https://reddit.com/u/^u"
-  subreddit:
-    badge: "\U000f044d" # nf-md-reddit
-    format: "r/^u"
-    link: "https://reddit.com/r/^u"

website/_data/nav.yml

@@ -30,8 +30,11 @@ sub:
     url: /register/
     idn: 'reg'
   - title: Contact Us
-    url: "#"
+    url: "/contact/"
     idn: 'msg'
-  - title: Theme Selection
+  # - title: Theme Selection
-    url: "#"
+  #   url: "#"
-    idn: 'theme'
+  #   idn: 'theme'
+  - title: Get a prize
+    url: "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+    target: _blank

website/_layouts/default.html

@@ -32,23 +32,29 @@
             </div>
                 <!-- icons at the bottom -->
                 <div class="nav-icons">
-            <a href="#" class="button" id="mbr-btn">
+            <a href="https://list.linuxposting.xyz" class="button" id="mbr-btn" target="_blank">
-                    <img src="/assets/img/icon.png">Members
+                    <img src="/assets/img/icons/tumblrlist.png">Tumblr List
                     <!-- This links to the list -->
                     <!-- Icon with multiple mice including Molly -->
+                    {% comment %}
+                    This should be the list for accounts on linuxposting later
+                    {% endcomment %}
             </a>
-            <a href="#" class="button" id="waf-btn">
+            <a href="https://w.linuxposting.xyz" class="button" id="waf-btn" target="_blank">
-                    <img src="/assets/img/icon.png">Wafrn
+                    <img src="/assets/img/icons/wafrn.png">Wafrn
                     <!-- Molly with waffle icon -->
             </a>
-            <a href="#" class="button" id="mail-btn">
+            <a href="https://mail.linuxposting.xyz" class="button" id="mail-btn" target="_blank">
-                    <img src="/assets/img/icon.png">Mail
+                    <img src="/assets/img/icons/email.png">Web Mail
                     <!-- Molly with letter icon -->
             </a>
-            <a href="#" class="button" id="frm-btn">
+            {% comment %}
+            <!-- This isn't a thing yet -->
+            <a href="#" class="button" id="frm-btn" target="_blank">
                     <img src="/assets/img/icon.png">Forum
                     <!-- Molly with music icon -->
             </a>
+            {% endcomment %}
                 </div>
         </div>
         <div class="content">

website/_plugins/anyat.rb

@@ -48,27 +48,40 @@ module Jekyll
       # platform@username@domain
       # or platform@username with domain N/A or default domain
       # Example: twitter@user, email@john@example.com
-      pattern = /(?<noconvert>!?[=$]?)(?<platform>[a-z0-9\-]+)@(?<username>[a-zA-Z0-9_\.\-]*[a-zA-Z0-9_\-])(?:@(?<domain>[a-zA-Z0-9\.\-]*[a-zA-Z0-9\-]))?(?=\W|$)/
+      pattern = /(?<noconvert>!?[=$]?)(?<platform>[a-z0-9\-]+)?@(?<username>[a-zA-Z0-9_\.\-]*[a-zA-Z0-9_\-])(?:@(?<domain>[a-zA-Z0-9\.\-]*[a-zA-Z0-9\-]))?(?=\W|$)/
 
       linkers = config['linkers'] || {}
 
       return input.gsub(pattern) do |match|
         noconvert = $~[:noconvert] || ''
 
+        unchanged = (
+          (($~[:noconvert] && $~[:noconvert][0] == '!'?
+            $~[:noconvert][1..-1] :
+            $~[:noconvert]) || '') +
+          ($~[:platform] ? "#{$~[:platform]}" : '') +
+          "@#{$~[:username]}" +
+          ($~[:domain] ? "@#{$~[:domain]}" : '')
+        )
+
         if noconvert && noconvert[0] == '!'
           # If the match starts with '!', do not convert
           # Remove the '!' and hand back the raw text
-          match_text = "#{$~[:noconvert][1..-1]}#{$~[:platform]}@#{$~[:username]}"
+          next unchanged
-          if $~[:domain]
-            match_text += "@#{$~[:domain]}"
-          end
-          next match_text
         end
         
         platform = $~[:platform]
         username = $~[:username]
         domain = $~[:domain]
         
+        if platform.nil? || platform.empty?
+          if config['default_platform']
+            platform = config['default_platform']
+          else
+            next unchanged
+          end
+        end
+        
         unless linkers.key?(platform)
           next "#{match} ^%^ Platform not supported ^%^"
         end

website/about.md

@@ -0,0 +1,6 @@
+---
+title: about -- linuxposting.xyz
+headline: about linuxposting.xyz
+---
+
+To provide for organizing, arming, and disciplining the Militia, and for governing such Part of them as may be employed in the Year of our Lord one thousand seven hundred and Eighty seven and of the Electors shall meet in their respective States, and will to the best of my Ability, preserve, protect and defend the Constitution of the United States under this Constitution, when ratified by the Legislature thereof. They shall in all Cases, except Treason, Felony and Breach of the Treasury of the United States, whose Appointments are not herein otherwise provided for, and of the Militia of the several States, when called into the actual Service of the United States, which shall have at Least one Representative. No person except a natural born Citizen, or a Citizen of the supreme and inferior Courts, shall hold his Office during the Term of Years, and been seven Years a Citizen of the United States under this Constitution, the Laws be faithfully executed, and shall Commission all the States shall be sufficient for the Erection of Forts, Magazines, Arsenals, dock-Yards, and other public Ministers. Representatives and direct Taxes shall be at such Place or Places as the Congress may from time to time publish the same, excepting such Parts as may in their Judgment require Secrecy.

website/contact.md

@@ -0,0 +1,9 @@
+---
+title: contact the people that matter in our world with kindness, love, and appreciation, such that we can all live happier lives -- linuxposting.xyz
+headline: Contact
+---
+
+You can contact us using the following methods:
+
+- Email: email@contact <!-- !contact@linuxposting.xyz because default domain -->
+- Tumblr: tumblr@linuxposting

website/index.md

@@ -1,6 +1,5 @@
 ---
 title: hello
-layout: default
 headline: stupid page
 ---
 

website/register.md

@@ -2,7 +2,6 @@
 # cspell: words Rabout Rexample
 # cspell: words btrfs steamos baloo-file
 title: Account Registration
-layout: default
 headline: Account Registration
 ---