Merge pull request #46 from SeiferTim/main

fixed events

Author: SeiferTim

layouts/events/single.html

@@ -77,26 +77,33 @@ <h2>{{ $eventDate }}</h2>
                                         {{ $event.where }}
                                     {{- end }}
                                 </p>
-                                
+
                                 {{- $description := $event.desc | safeHTML -}}
 
-                                {{- $matches := findRESubmatch `[<br>]+For full details, including the address, and to RSVP see: <a href="([^"]+)"[^>]*>[^<]+</a>` $description -}}
+                                {{/* Match and extract the event ID from the RSVP section */}}
+                                {{- $regex := `(?s)(<br\s*/?>)*\s*For full details, including the address, and to RSVP see:(?:.*)(?:<a[^>]*href=")?https://www\.meetup\.com/st-louis-game-developers/events/([0-9]+)/?(?:".*?>.*?</a>)?` -}}
+
+                                {{- $matches := findRESubmatch $regex $description -}}
 
                                 {{- if gt (len $matches) 0 -}}
-                                {{- $match := index $matches 0 -}}         {{/* first full match group */}}
-                                {{- $fullMatch := index $match 0 -}}       {{/* entire match string */}}
-                                {{- $url := index $match 1 -}}             {{/* captured URL */}}
+                                    {{- $firstMatch := index $matches 0 -}}          {{/* the inner []string */}}
+                                    {{- $fullMatch := index $firstMatch 0 -}}        {{/* full matched string */}}
+                                    {{- $eventID := index $firstMatch 1 -}}          {{/* captured group with event ID */}}
 
-                                {{- $cleanDescription := replace $description $fullMatch "" -}}
+                                    {{- $cleanDescription := replace $description $fullMatch "" -}}
 
-                                <p class="card-text">{{ $cleanDescription | safeHTML }}</dd>
-                                <div class="mt-3 text-center">
-                                    <a href="{{ $url }}" class="btn btn-primary" target="_blank" rel="noopener">RSVP</a>
-                                </div>
+                                    <p class="card-text">{{ $cleanDescription | safeHTML }}</dd>
+                                    <div class="mt-3 text-center">
+                                        <a href="https://www.meetup.com/st-louis-game-developers/events/{{ $eventID }}" class="btn btn-primary" target="_blank" rel="noopener">
+                                        Details & RSVP
+                                        </a>
+                                    </div>
                                 {{- else -}}
                                     <p class="card-text">{{ $description }}</dd>
                                 {{- end }}
 
+                                
+                                
                             </div>
                         </div>
                     </div>

layouts/partials/next-event.html

@@ -43,25 +43,29 @@
 
         {{- $description := $next.description | safeHTML -}}
 
-        {{- $matches := findRESubmatch `[<br>]+For full details, including the address, and to RSVP see: <a href="([^"]+)"[^>]*>[^<]+</a>` $description -}}
+        {{/* Match and extract the event ID from the RSVP section */}}
+        {{- $regex := `(?s)(<br\s*/?>)*\s*For full details, including the address, and to RSVP see:(?:.*)(?:<a[^>]*href=")?https://www\.meetup\.com/st-louis-game-developers/events/([0-9]+)/?(?:".*?>.*?</a>)?` -}}
+
+        {{- $matches := findRESubmatch $regex $description -}}
 
         {{- if gt (len $matches) 0 -}}
-          {{- $match := index $matches 0 -}}         {{/* first full match group */}}
-          {{- $fullMatch := index $match 0 -}}       {{/* entire match string */}}
-          {{- $url := index $match 1 -}}             {{/* captured URL */}}
+          {{- $firstMatch := index $matches 0 -}}          {{/* the inner []string */}}
+          {{- $fullMatch := index $firstMatch 0 -}}        {{/* full matched string */}}
+          {{- $eventID := index $firstMatch 1 -}}          {{/* captured group with event ID */}}
 
           {{- $cleanDescription := replace $description $fullMatch "" -}}
 
           <dd class="">{{ $cleanDescription | safeHTML }}</dd>
           <div class="mt-3 text-center">
-            <a href="{{ $url }}" class="btn btn-primary" target="_blank" rel="noopener">RSVP</a>
+            <a href="https://www.meetup.com/st-louis-game-developers/events/{{ $eventID }}" class="btn btn-primary" target="_blank" rel="noopener">
+              Details & RSVP
+            </a>
           </div>
         {{- else -}}
           <dd class="">{{ $description }}</dd>
         {{- end }}
 
 
-        
     </dl>
 </section>
 {{ else }}