=New Gitbit setpu

Jake Vanderwerf

5 hours ago 56a9a1ccf764ff7a6af8f8a2292cb07443cb4aa7

 inc/managers/DirectoryManager.php

@@ -38,14 +38,14 @@

      jvb_register_do_once('buildDirectories', [$this, 'activate']);
      add_action('init', [$this, 'registerDirectories']);
        add_filter('render_block', [$this, 'renderBlock'], 998, 3);
        add_filter('pre_render_block', [$this, 'renderBlock'], 20, 3);
    }

    public function registerDirectories():void
    {

      $singular = !empty(Site::getDirectorySingular())?:'Directory';
      $plural = !empty(Site::getDirectorySingular())?: 'Directories';
      $singular = Site::getDirectorySingular()??'Directory';
      $plural = Site::getDirectoryPlural()??'Directories';
      $config = [
         'labels' => [
            'name'               => $plural,
@@ -85,6 +85,7 @@
   public function getDirectories():array
   {
      $directories = get_option(BASE.'directories');

      if (!$directories) {
         $directories = [];
         //content
@@ -131,15 +132,36 @@
         }

         $config = $registrar->getConfig('directory');

         $title = $config['title'];
         //Bail early if we've already created the page
         $existing = new WP_Query([
            'post_type' => BASE.'directory',
            'name'   => sanitize_title($title),
            'posts_per_page'  => 1,
         ]);
         if ($existing->have_posts()) {
            $existing = $existing->posts[0];
            $created[$directory] = $existing->ID;
            $directories[$directory] = [
               'slug'   => $existing->post_name,
               'title'  => $existing->post_title,
               'ID'  => $existing->ID,
               'url' => get_the_permalink($existing->ID),
               'page'   => $existing->post_title,
               'description'=> $existing->post_excerpt,
               'type'   => $type,
               'extra'  => $config[$directory]['directory_extra']??[],
            ];
            continue;
         }

         $excerpt = implode(' ', $config['description']??[]);
         $ID = wp_insert_post([
            'post_type'    => BASE.'directory',
            'post_title'   => $title,
            'post_status'  => 'publish',
            'post_excerpt' => $excerpt,
            'slug'         => sanitize_title($title)
            'post_name'       => sanitize_title($title)
         ]);
         if (!is_wp_error($ID)) {
            add_post_meta($ID, self::$type, $type);
@@ -207,7 +229,6 @@
//                ];
//            }
//        }

        if (!empty($created)) {
            update_option(BASE.'directory_ids', $created);
        }
@@ -219,6 +240,7 @@
   protected function buildDirectoryList():array
   {
      $saved = get_option(BASE.'directory_list', []);

      if (empty($saved)) {
         $all = new WP_Query([
            'post_type' => BASE.'directory',
@@ -352,7 +374,7 @@
               $config = Registrar::getInstance($slug);
               $aOpen = '<a href="'.$directory['url'].'" title="See our list of '.$directory['title'].'">';
               $aClose = '</a>';
               $cache .= '<li class="directory col start">
               $cache .= '<li class="directory col left">
                  '. $aOpen.jvbIcon($config->getIcon() !== '' ? $config->getIcon() :'list-dashes').$directory['title'].$aClose;
               if (!empty($directory['description'])) {
                  $cache .= '<div class="description">';
@@ -391,7 +413,7 @@
      );
        if ($current !== '' && array_key_exists($current, $this->directories())) {
            $open = ($open) ? ' open' : '';
            $cache = '<details'.$open.'><summary class="row btw">Other '.$this->referAs(true).':</summary>'.
            $cache = '<details'.$open.'><summary class="row x-btw">Other '.$this->referAs(true).':</summary>'.
                     str_replace('id="'.$current.'"', 'id="'.$current.'" class="current"', $cache)
                     .'</details>';
        }
@@ -592,7 +614,7 @@
         $children =$this->renderListChunk($taxonomy, $term->term_id);
         $out .= '<li>';
         if ($children !== '') {
            $out .= '<details class="term"><summary class="row btw"><a href="'.get_term_link($term->term_id, $term->taxonomy).'" title="See more '.html_entity_decode($term->name).'">'.$term->name.'</a></summary>';
            $out .= '<details class="term"><summary class="row x-btw"><a href="'.get_term_link($term->term_id, $term->taxonomy).'" title="See more '.html_entity_decode($term->name).'">'.$term->name.'</a></summary>';
            $out .= $children;
            $out .= '</details>';
         } else {
@@ -647,7 +669,7 @@

        $out = '<ul class="list-none">';
        foreach ($list as $letter => $items) {
            $out .= '<li id="starts-with-'.$letter.'" class="row a-start btw nowrap"><h3>'.strtoupper($letter).'</h3><ul>';
            $out .= '<li id="starts-with-'.$letter.'" class="row top x-btw nowrap"><h3>'.strtoupper($letter).'</h3><ul>';
            foreach ($items as $item) {
                $extra = '';
                if (!empty($item['extra'])) {
@@ -662,7 +684,7 @@
            $item_html = apply_filters('jvb_directory_render_item', '', $item, $type, $extra);

            if (empty($item_html)) {
               $item_html = '<li class="row btw">
               $item_html = '<li class="row x-btw">
                    <a href="'.$item['url'].'" title="More about '.$item['name'].'">
                        '.$item['name'].'</a>'.$extra.'
                </li>';
@@ -676,7 +698,7 @@
        return $out;
    }

    public function renderBlock(string $content, array $block, WP_Block $instance)
    public function renderBlock(?string $content, array $block, ?WP_Block $instance)
    {
        if (!is_post_type_archive(BASE.'directory') && !is_singular(BASE.'directory')) {
            return $content;
@@ -685,7 +707,6 @@
            return $content;
        }

      error_log('Still working on directory manager...');
        // For archive page
        if (is_post_type_archive(BASE.'directory') && $block['blockName'] === 'core/group') {
            return ($block['attrs']['tagName']??'' === 'main') ? '<main>'.$this->renderArchive().'</main>' : $content;